Fix possible TAStudio NRE (squashed PR #3936)

* Skip `AskSaveChanges` in disposed `TAStudio`, fix #3499 * Revert "Skip `AskSaveChanges` in disposed `TAStudio`, fix #3499" This reverts commit eabe939. * Stop calling `AskSaveChanges()` on inactive tools, fix #3499
TASEmulators · Jun 5, 2024 · 2c6129f · 2c6129f
1 parent 5da5697
commit 2c6129f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs b/src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
@@ -97,7 +97,7 @@ public override void Restart()
 
 		public override bool AskSaveChanges()
 		{
-			if (_unsavedZones.Count == 0 || IsDisposed)
+			if (_unsavedZones.Count == 0)
 			{
 				return true;
 			}

diff --git a/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/src/BizHawk.Client.EmuHawk/tools/ToolManager.cs
@@ -616,9 +616,7 @@ public bool AskSave()
 				return true;
 			}
 
-			return _tools
-				.Select(tool => tool.AskSaveChanges())
-				.All(result => result);
+			return _tools.TrueForAll(tool => !tool.IsActive || tool.AskSaveChanges());
 		}
 
 		/// <summary>