From 668a90fdc6183b82798e649d9839dc1fbfaf23bd Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Fri, 19 Aug 2011 01:05:30 +0000
Subject: [PATCH] On SoftReset() reset core frame counter if no movie is active

---
 BizHawk.MultiClient/MainForm.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 64f9d49743..6ea7fe9bea 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -2217,7 +2217,11 @@ namespace BizHawk.MultiClient
 		{
 			//is it enough to run this for one frame? maybe..
 			if (Global.Emulator.ControllerDefinition.BoolButtons.Contains("Reset"))
+			{
 				Global.ClickyVirtualPadController.Click("Reset");
+				if (UserMovie.Mode == MOVIEMODE.INACTIVE)
+					Global.Emulator.ResetFrameCounter();
+			}
 		}
 
 		public void UpdateStatusSlots()