diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 454824458c..d1c5b3e77f 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -1176,13 +1176,26 @@ namespace BizHawk.MultiClient private void MainForm_Deactivate(object sender, EventArgs e) { if (!Global.Config.RunInBackground) + { + if (EmulatorPaused) + { + wasPaused = true; + } PauseEmulator(); + } } private void MainForm_Activated(object sender, EventArgs e) { if (!Global.Config.RunInBackground) - UnpauseEmulator(); + { + + if (!wasPaused) + { + UnpauseEmulator(); + } + wasPaused = false; + } } private void readonlyToolStripMenuItem_Click(object sender, EventArgs e)