Fix crash in options window

Author: Fusion86

Cirilla/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.6.0.0")]
-[assembly: AssemblyFileVersion("0.6.0.0")]
+[assembly: AssemblyVersion("0.6.1.0")]
+[assembly: AssemblyFileVersion("0.6.1.0")]

Cirilla/ViewModels/GMDViewModel.cs

@@ -43,7 +43,7 @@ public GMDViewModel(string path) : base(path)
 
             // Entries
             for (int i = 0; i < _context.Entries.Count; i++)
-                    Entries.Add(new GMDEntryViewModel(i, _context.Entries[i]));
+                Entries.Add(new GMDEntryViewModel(i, _context.Entries[i]));
 
             // Filtered Entries CollectionViewSource
             FilteredEntries = CollectionViewSource.GetDefaultView(Entries);
@@ -90,7 +90,13 @@ public void AddEntryNoKey()
             Entries.Add(vm);
         }
 
-        public bool IsUnsafeModeEnabled() => Properties.Settings.Default.Config.UnsafeModeEnabled;
+        public bool IsUnsafeModeEnabled()
+        {
+            if (Properties.Settings.Default.Config != null)
+                return Properties.Settings.Default.Config.UnsafeModeEnabled;
+
+            return false;
+        }
 
         public void TriggerSearch()
         {

Cirilla/ViewModels/MainWindowViewModel.cs

@@ -109,18 +109,12 @@ public void SaveInWorkingDirectory()
 
         public bool CanSaveInWorkingDirectory()
         {
-            try
-            {
-                if (SelectedItem is FileTypeTabItemViewModelBase item && Properties.Settings.Default.Config.WorkingDirectoryPath != null)
+            if (SelectedItem is FileTypeTabItemViewModelBase item)
+                if (Properties.Settings.Default.Config != null && Properties.Settings.Default.Config.WorkingDirectoryPath != null)
                     return Directory.Exists(Properties.Settings.Default.Config.WorkingDirectoryPath)
                         && GetFullRelativePathForGameFile(item.Filepath) != null;
 
-                return false;
-            }
-            catch
-            {
-                return false;
-            }
+            return false;
         }
 
         private string GetFullRelativePathForGameFile(string path)

Cirilla/Windows/OptionsWindow.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:root="clr-namespace:Cirilla"
         mc:Ignorable="d"
-        Title="Options" Height="300" Width="600" Closed="Window_Closed">
+        Title="Options" Height="300" Width="600">
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
@@ -70,7 +70,6 @@
                 <ColumnDefinition Width="100"/>
             </Grid.ColumnDefinitions>
 
-            <Button Grid.Column="0" Content="Close &amp; discard changes" Click="Close_Click"/>
             <Button Grid.Column="2" Content="Save" Click="Save_Click"/>
         </Grid>
     </Grid>

Cirilla/Windows/OptionsWindow.xaml.cs

@@ -33,20 +33,9 @@ private void ExtractedFiles_Browse(object sender, RoutedEventArgs e)
             }
         }
 
-        private void Close_Click(object sender, RoutedEventArgs e)
-        {
-            Properties.Settings.Default.Reload();
-            Close();
-        }
-
         private void Save_Click(object sender, RoutedEventArgs e)
         {
             Properties.Settings.Default.Save();
         }
-
-        private void Window_Closed(object sender, System.EventArgs e)
-        {
-            Properties.Settings.Default.Reload();
-        }
     }
 }