Latest Source Changes to Fix the Unhandled Crashes

beninswe · Jun 5, 2020 · 63b978f · 63b978f
1 parent c32c531
commit 63b978f
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 71 deletions.
diff --git a/Sonic3AIR_ModManager/Controls/ModManager.xaml.cs b/Sonic3AIR_ModManager/Controls/ModManager.xaml.cs
@@ -684,6 +684,7 @@ private void devModeCheckbox_Click(object sender, RoutedEventArgs e)
 
         private void Window_Closed(object sender, EventArgs e)
         {
+            Program.Log.InfoFormat("[ModManager] Closing Mod Manager Window...");
             Management.MainDataModel.Settings.Save();
             App.Instance.Shutdown();
         }

diff --git a/Sonic3AIR_ModManager/Controls/ModViewer/ModViewer.xaml b/Sonic3AIR_ModManager/Controls/ModViewer/ModViewer.xaml
@@ -72,74 +72,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="/Sonic 3 A.I.R Mod Manager;component/Controls/Assets/Icons.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
-            <Style x:Key="TextBoxStyle1" TargetType="{x:Type TextBox}">
-                <Setter Property="Background" Value="Transparent"/>
-                <Setter Property="BorderBrush" Value="Transparent"/>
-                <Setter Property="Foreground" Value="{DynamicResource NormalText}"/>
-                <Setter Property="SelectionBrush" Value="Transparent"></Setter>
-                <Setter Property="BorderThickness" Value="0"/>
-                <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/>
-                <Setter Property="HorizontalContentAlignment" Value="Left"/>
-                <Setter Property="AllowDrop" Value="true"/>
-                <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
-                <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type TextBox}">
-                            <Grid x:Name="background">
-                                <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                                    <ScrollViewer x:Name="PART_ContentHost" Focusable="false" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
-                                </Border>
-                            </Grid>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-                <Style.Triggers>
-                    <MultiTrigger>
-                        <MultiTrigger.Conditions>
-                            <Condition Property="IsInactiveSelectionHighlightEnabled" Value="true"/>
-                            <Condition Property="IsSelectionActive" Value="false"/>
-                        </MultiTrigger.Conditions>
-                        <Setter Property="SelectionBrush" Value="{DynamicResource {x:Static SystemColors.InactiveSelectionHighlightBrushKey}}"/>
-                    </MultiTrigger>
-                </Style.Triggers>
-            </Style>
-            <Style TargetType="{x:Type ListView}">
-                <Setter Property="Background" Value="{DynamicResource ListBox.Static.Background}"/>
-                <Setter Property="BorderBrush" Value="{DynamicResource ListBox.Static.Border}"/>
-                <Setter Property="BorderThickness" Value="1"/>
-                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-                <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-                <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-                <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
-                <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-                <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-                <Setter Property="VerticalContentAlignment" Value="Center"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type ListView}">
-                            <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="1" SnapsToDevicePixels="true">
-                                <ScrollViewer Focusable="false" Padding="{TemplateBinding Padding}">
-                                    <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                </ScrollViewer>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="IsEnabled" Value="false">
-                                    <Setter Property="Background" TargetName="Bd" Value="{DynamicResource ListBox.Disabled.Background}"/>
-                                    <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource ListBox.Disabled.Border}"/>
-                                </Trigger>
-                                <MultiTrigger>
-                                    <MultiTrigger.Conditions>
-                                        <Condition Property="IsGrouping" Value="true"/>
-                                        <Condition Property="VirtualizingPanel.IsVirtualizingWhenGrouping" Value="false"/>
-                                    </MultiTrigger.Conditions>
-                                    <Setter Property="ScrollViewer.CanContentScroll" Value="false"/>
-                                </MultiTrigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
+
             <DataTemplate x:Key="ModViewTemplate">
                 <Border BorderThickness="1" BorderBrush="{DynamicResource ButtonBorder}" Visibility="{Binding Visibility}">
                     <Grid Width="Auto" HorizontalAlignment="Stretch" Margin="1">

diff --git a/Sonic3AIR_ModManager/Controls/Updater/Updater.xaml.cs b/Sonic3AIR_ModManager/Controls/Updater/Updater.xaml.cs
@@ -284,7 +284,11 @@ private void UpdateDownloadComplete()
                     }
                     else
                     {
-                        throw new Exception();
+                        //TODO: Improve Exception Handling
+                        var exception = new Exception("Unable to Prase Version");
+                        MessageBox.Show(Program.LanguageResource.GetString("UpdateFailedError") + Environment.NewLine, exception.Message);
+                        Program.AIRUpdaterState = Program.UpdateState.Finished;
+                        Close();
                     }
                 }
 

diff --git a/Sonic3AIR_ModManager/Management/External/GamebananaAPI.cs b/Sonic3AIR_ModManager/Management/External/GamebananaAPI.cs
@@ -50,6 +50,7 @@ public static void GetNextAPIPendingInstall()
         }
         public static void GamebananaAPI_Install(string data)
         {
+            Program.Log.InfoFormat("[GBPAPI] Attempting to Download Mod...");
             if (!Directory.Exists(Management.ProgramPaths.Sonic3AIR_MM_TempModsFolder)) Directory.CreateDirectory(Management.ProgramPaths.Sonic3AIR_MM_TempModsFolder);
             string url = data.Replace("s3airmm://", "");
             if (url == "") MessageBox.Show("Invalid URL", "Invalid URL", MessageBoxButtons.OK, MessageBoxIcon.Error);

diff --git a/Sonic3AIR_ModManager/Properties/PostBuild/Build.zip b/Sonic3AIR_ModManager/Properties/PostBuild/Build.zip
diff --git a/Sonic3AIR_ModManager/Properties/PostBuild/Build_20.5.21.3.zip b/Sonic3AIR_ModManager/Properties/PostBuild/Build_20.5.21.3.zip
diff --git a/Sonic3AIR_ModManager/Properties/PostBuild/Installer/Script.nsi b/Sonic3AIR_ModManager/Properties/PostBuild/Installer/Script.nsi
@@ -118,10 +118,11 @@ UninstPage instfiles
 Section -MainProgram
 ${INSTALL_TYPE}
 SetOverwrite ifnewer
+RmDir /r "$INSTDIR"
 SetOutPath "$INSTDIR"
 File /r D:\Users\CarJem\source\sonic3air_repos\Sonic3AIR_ModManager\Sonic3AIR_ModManager\bin\Release\*.*
-File D:\Users\CarJem\source\sonic3air_repos\Sonic3AIR_ModManager\Installer\UninstallOptions.ini
-File D:\Users\CarJem\source\sonic3air_repos\Sonic3AIR_ModManager\Installer\AIR_Original_Icon_HD.ico
+#File D:\Users\CarJem\source\sonic3air_repos\Sonic3AIR_ModManager\Installer\UninstallOptions.ini
+#File D:\Users\CarJem\source\sonic3air_repos\Sonic3AIR_ModManager\Installer\AIR_Original_Icon_HD.ico
 SectionEnd
 
 ######################################################################

diff --git a/Sonic3AIR_ModManager/Properties/PostBuild/Installer/Setup.exe b/Sonic3AIR_ModManager/Properties/PostBuild/Installer/Setup.exe