Fix rewind indicator not being updated on core close

YoshiRulz · YoshiRulz · commit 6e63322f3f4a · 2025-04-10T21:35:53.000+10:00
fixes eb7296d
diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs
@@ -4070,8 +4070,7 @@ private void CloseGame(bool clearSram = false)
 			AutoSaveStateIfConfigured();
 
 			CommitCoreSettingsToConfig();
-			Rewinder?.Dispose();
-			Rewinder = null;
+			DisableRewind();
 
 			if (MovieSession.Movie.IsActive()) // Note: this must be called after CommitCoreSettingsToConfig()
 			{
@@ -4165,12 +4164,14 @@ public void EnableRewind(bool enabled)
 
 				AddOnScreenMessage($"Rewind {(enabled ? "enabled" : "suspended")}");
 			}
+			UpdateStatusBarRewindIndicator();
 		}
 
 		public void DisableRewind()
 		{
 			Rewinder?.Dispose();
 			Rewinder = null;
+			UpdateStatusBarRewindIndicator();
 		}
 
 		private int SlotToInt(string slot)

Original file line number	Diff line number	Diff line change
`@@ -4070,8 +4070,7 @@ private void CloseGame(bool clearSram = false)`
`4070`	`4070`	`AutoSaveStateIfConfigured();`
`4071`	`4071`
`4072`	`4072`	`CommitCoreSettingsToConfig();`
`4073`		`- Rewinder?.Dispose();`
`4074`		`- Rewinder = null;`
	`4073`	`+ DisableRewind();`
`4075`	`4074`
`4076`	`4075`	`if (MovieSession.Movie.IsActive()) // Note: this must be called after CommitCoreSettingsToConfig()`
`4077`	`4076`	`{`
`@@ -4165,12 +4164,14 @@ public void EnableRewind(bool enabled)`
`4165`	`4164`
`4166`	`4165`	`AddOnScreenMessage($"Rewind {(enabled ? "enabled" : "suspended")}");`
`4167`	`4166`	`}`
	`4167`	`+ UpdateStatusBarRewindIndicator();`
`4168`	`4168`	`}`
`4169`	`4169`
`4170`	`4170`	`public void DisableRewind()`
`4171`	`4171`	`{`
`4172`	`4172`	`Rewinder?.Dispose();`
`4173`	`4173`	`Rewinder = null;`
	`4174`	`+ UpdateStatusBarRewindIndicator();`
`4174`	`4175`	`}`
`4175`	`4176`
`4176`	`4177`	`private int SlotToInt(string slot)`