fix a crash

AndrewSav · May 8, 2024 · ad58080 · ad58080
1 parent e5ec608
commit ad58080
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 0.0.6 (unreleased)
+## 0.0.7 (unreleased)
 - Add ability to hide items if they cannot be achived in the current save due to missing prerequisites - work in progress
 
+## 0.0.6 (unreleased)
+- Fixed a crash on World Analyzer tab
+- Made improvements so that next time something like this happens, it at least gives a error
+
 ## 0.0.5 (8 May 2024)
 - Fixed release zip file, it wrongly used to have the release in the "publish" subfolder
 - Dim items in "Possible Items" columns if these items were already looted in the save if possible. This does not work for all items, as not all items appear in saves. Also added an option not to dim

diff --git a/Remnant2SaveAnalyzer/Remnant2SaveAnalyzer.csproj b/Remnant2SaveAnalyzer/Remnant2SaveAnalyzer.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="lib.remnant2.analyzer" Version="0.0.6" />
+    <PackageReference Include="lib.remnant2.analyzer" Version="0.0.7" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
     <PackageReference Include="Serilog" Version="3.1.1" />
     <PackageReference Include="System.IO.Hashing" Version="8.0.0" />

diff --git a/Remnant2SaveAnalyzer/RemnantSave.cs b/Remnant2SaveAnalyzer/RemnantSave.cs
@@ -97,7 +97,16 @@ public void UpdateCharacters()
             {
                 bool first = _remnantDataset == null;
 
-                _remnantDataset = Analyzer.Analyze(_savePath, _remnantDataset);
+                try
+                {
+                    _remnantDataset = Analyzer.Analyze(_savePath, _remnantDataset);
+                }
+                catch (Exception ex)
+                {
+                    Logger.Error(ex);
+                    return;
+                }
+
                 if (first)
                 {
                     ReportAnalyzerDebugMessages();

diff --git a/Remnant2SaveAnalyzer/Views/Pages/WorldAnalyzerPage.xaml.cs b/Remnant2SaveAnalyzer/Views/Pages/WorldAnalyzerPage.xaml.cs
@@ -75,6 +75,8 @@ public WorldAnalyzerPage(ViewModels.WorldAnalyzerViewModel viewModel, string? pa
                 BackupsPage.BackupSaveRestored += BackupsPage_BackupSaveRestored;
             }
 
+            if (_save.Dataset == null) return;
+
             Debug.Assert(_save.Dataset != null, "_save.Dataset != null");
             CharacterControl.ItemsSource = _save.Dataset.Characters;