diff --git a/AlotAddOnGUI/7z/7z.dll b/AlotAddOnGUI/7z/7z.dll index 11ce2f1d..042cbf1d 100644 Binary files a/AlotAddOnGUI/7z/7z.dll and b/AlotAddOnGUI/7z/7z.dll differ diff --git a/AlotAddOnGUI/7z/7z.exe b/AlotAddOnGUI/7z/7z.exe index bc774bbf..c8feeddf 100644 Binary files a/AlotAddOnGUI/7z/7z.exe and b/AlotAddOnGUI/7z/7z.exe differ diff --git a/AlotAddOnGUI/AlotAddOnGUI.csproj b/AlotAddOnGUI/AlotAddOnGUI.csproj index 9e446fc6..c64b3ee1 100644 --- a/AlotAddOnGUI/AlotAddOnGUI.csproj +++ b/AlotAddOnGUI/AlotAddOnGUI.csproj @@ -224,7 +224,7 @@ if $(ConfigurationName) == Release (copy "$(SolutionDir)ReleaseBuilder.ps1" "$(T - + \ No newline at end of file diff --git a/AlotAddOnGUI/App.xaml.cs b/AlotAddOnGUI/App.xaml.cs index 7d4ac709..53b71fad 100644 --- a/AlotAddOnGUI/App.xaml.cs +++ b/AlotAddOnGUI/App.xaml.cs @@ -4,6 +4,7 @@ using System.Configuration; using System.Data; using System.Linq; +using System.Text; using System.Threading.Tasks; using System.Windows; @@ -30,13 +31,28 @@ public App() : base() void OnDispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e) { - string errorMessage = string.Format("An unhandled application exception occurred. This exception is not being handled, only logged: {0}", e.Exception.Message); - string st = e.ToString(); + string errorMessage = string.Format("ALOT Addon GUI has encountered an uncaught error! This exception is not being handled, only logged for debugging:"); + string st = FlattenException(e.Exception); Log.Error(errorMessage); Log.Error(st); //MetroDial.Show(errorMessage, "Error", MessageBoxButton.OK, MessageBoxImage.Error); //e.Handled = true; } + + public static string FlattenException(Exception exception) + { + var stringBuilder = new StringBuilder(); + + while (exception != null) + { + stringBuilder.AppendLine(exception.Message); + stringBuilder.AppendLine(exception.StackTrace); + + exception = exception.InnerException; + } + + return stringBuilder.ToString(); + } } } diff --git a/AlotAddOnGUI/MainWindow.xaml.cs b/AlotAddOnGUI/MainWindow.xaml.cs index 5c33f712..2f177a2e 100644 --- a/AlotAddOnGUI/MainWindow.xaml.cs +++ b/AlotAddOnGUI/MainWindow.xaml.cs @@ -471,7 +471,7 @@ private async Task FetchManifest() AddonFilesLabel.Content = "Downloading latest installer manifest"; try { - await webClient.DownloadFileTaskAsync("https://rawgit.com/Mgamerz/AlotAddOnGUI/master/manifest.xml", @"manifest-new.xml"); + await webClient.DownloadFileTaskAsync("https://raw.githubusercontent.com/Mgamerz/AlotAddOnGUI/master/manifest.xml", @"manifest-new.xml"); File.Delete(EXE_DIRECTORY + @"manifest.xml"); File.Move(EXE_DIRECTORY + @"manifest-new.xml", EXE_DIRECTORY + @"manifest.xml"); Log.Information("Manifest fetched."); @@ -494,7 +494,7 @@ private async Task FetchManifest() readManifest(); - Log.Information("Manifest read. Switching over to user control"); + Log.Information("readManifest() has completed. Switching over to user control"); Install_ProgressBar.IsIndeterminate = false; HeaderLabel.Text = "Download the listed files, then drag and drop the files onto this window.\nOnce all items are ready, build the addon."; @@ -938,7 +938,7 @@ private bool ExtractAddons(int game) } } } - + Log.Information("Completed staging."); InstallWorker.ReportProgress(0); diff --git a/AlotAddOnGUI/Properties/AssemblyInfo.cs b/AlotAddOnGUI/Properties/AssemblyInfo.cs index 5b2f65b3..7c9705cb 100644 --- a/AlotAddOnGUI/Properties/AssemblyInfo.cs +++ b/AlotAddOnGUI/Properties/AssemblyInfo.cs @@ -17,7 +17,7 @@ [assembly: AssemblyCulture("")] // Version informationr( -[assembly: AssemblyVersion("1.2.31.97")] -[assembly: AssemblyFileVersion("1.2.31.97")] +[assembly: AssemblyVersion("1.2.35.107")] +[assembly: AssemblyFileVersion("1.2.35.107")] [assembly: NeutralResourcesLanguageAttribute( "en-US" )] diff --git a/AlotAddOnGUI/memodder/MassEffectModder.exe b/AlotAddOnGUI/memodder/MassEffectModder.exe index 2b683bf7..01e55bb2 100644 Binary files a/AlotAddOnGUI/memodder/MassEffectModder.exe and b/AlotAddOnGUI/memodder/MassEffectModder.exe differ