Fixed NRE during SettingsView unload and added MacOS file to .gitignore.

blish-hud · Feb 5, 2024 · 651dee4 · 651dee4
1 parent e909fb3
commit 651dee4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -430,3 +430,6 @@ fabric.properties
 
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
+
+# MacOS Files
+.DS_Store
diff --git a/Blish HUD/GameServices/Settings/UI/Views/SettingsMenuView.cs b/Blish HUD/GameServices/Settings/UI/Views/SettingsMenuView.cs
@@ -79,7 +79,9 @@ private void SettingsListMenuOnItemSelected(object sender, ControlActivatedEvent
         protected override void Unload() {
             base.Unload();
 
-            _menuSettingsList.ItemSelected -= SettingsListMenuOnItemSelected;
+            if (_menuSettingsList != null) {
+                _menuSettingsList.ItemSelected -= SettingsListMenuOnItemSelected;
+            }
         }
 
     }