Various fixes (sorry)

Meowmaritus · Jul 12, 2019 · dca4924 · dca4924
1 parent 7753683
commit dca4924
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/DSFBX.Core/DSFBXImporter.cs b/DSFBX.Core/DSFBXImporter.cs
@@ -1797,22 +1797,22 @@ public async Task<bool> BeginImport()
 
                 bool isSuccess = false;
 
-                //try
-                //{
+                try
+                {
                     isSuccess = Import();
-                //}
-                //catch (Exception ex)
-                //{
-                //    PrintError($"Exception encountered while attempting to import:\n\n{ex}");
-
-                //    //if (File.Exists(EntityBndPath + ".bak"))
-                //    //    File.Copy(EntityBndPath + ".bak", EntityBndPath, true);
-                //    //else
-                //    //    PrintError("Unfortunately, the automatically-generated " +
-                //    //        "backup file was mysteriously gone and you are now most likely left " +
-                //    //        "with an empty entity BND file (please notify me, " +
-                //    //        "Meowmaritus, if you ever see this error message).");
-                //}
+                }
+                catch (Exception ex)
+                {
+                    PrintError($"Exception encountered while attempting to import:\n\n{ex}");
+
+                    //if (File.Exists(EntityBndPath + ".bak"))
+                    //    File.Copy(EntityBndPath + ".bak", EntityBndPath, true);
+                    //else
+                    //    PrintError("Unfortunately, the automatically-generated " +
+                    //        "backup file was mysteriously gone and you are now most likely left " +
+                    //        "with an empty entity BND file (please notify me, " +
+                    //        "Meowmaritus, if you ever see this error message).");
+                }
 
                 OnImportEnding();
 

diff --git a/DSFBX.ImporterGUI/DSFBXConfig.cs b/DSFBX.ImporterGUI/DSFBXConfig.cs
@@ -14,7 +14,7 @@ public class DSFBXConfig : INotifyPropertyChanged
         public string Manual_LastModelTypeDropdownOption = "Weapon";
 
 
-        private bool _forceReloadCHR = false;
+        private bool _forceReloadCHR = true;
         public bool ForceReloadCHR
         {
             get => _forceReloadCHR;
@@ -25,7 +25,7 @@ public bool ForceReloadCHR
             }
         }
 
-        private bool _forceReloadPARTS = false;
+        private bool _forceReloadPARTS = true;
         public bool ForceReloadPARTS
         {
             get => _forceReloadPARTS;

diff --git a/DSFBX.ImporterGUI/MainWindow.xaml b/DSFBX.ImporterGUI/MainWindow.xaml
@@ -28,9 +28,9 @@
             Margin="0,4,10,0"
             FontSize="12"
             FontWeight="SemiBold"
-            Foreground="White"
+            Foreground="Black"
             Height="20" Click="ButtonDONATE_Click"
-            Background="Green"
+            Background="LightGreen"
             />
 
         <Grid
@@ -498,8 +498,8 @@
             Margin="93,0,0,4" Height="24"
             VerticalContentAlignment="Center"
             />
-        <CheckBox x:Name="checkboxForceReloadCHR" IsChecked="{Binding Config.ForceReloadCHR}" Content="Force Reload Character Model After Importing" HorizontalAlignment="Right" Margin="0,0,10,8" VerticalAlignment="Bottom" Width="268" />
-        <CheckBox x:Name="checkboxForceReloadPARTS" IsChecked="{Binding Config.ForceReloadPARTS}" Content="Force Reload Player Equipment Models After Importing" HorizontalAlignment="Right" Margin="0,0,283,8" VerticalAlignment="Bottom" Width="318" />
+        <CheckBox x:Name="checkboxForceReloadCHR" IsChecked="{Binding Config.ForceReloadCHR}" IsEnabled="False" Content="Force Reload Character Model After Importing" HorizontalAlignment="Right" Margin="0,0,10,8" VerticalAlignment="Bottom" Width="268" />
+        <CheckBox x:Name="checkboxForceReloadPARTS" IsChecked="{Binding Config.ForceReloadPARTS}" IsEnabled="False" Content="Force Reload Player Equipment Models After Importing" HorizontalAlignment="Right" Margin="0,0,283,8" VerticalAlignment="Bottom" Width="318" />
 
     </Grid>