From 14e9e38c4449fab5cfd646358f7ac99d2a549641 Mon Sep 17 00:00:00 2001 From: goyuken Date: Thu, 17 Jul 2014 22:27:33 +0000 Subject: [PATCH] fix some bug with certain case of rom load failure maybe --- BizHawk.Client.EmuHawk/MainForm.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 11a8f6ab2c..78d614be2a 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -3062,7 +3062,8 @@ namespace BizHawk.Client.EmuHawk // the new settings objects CommitCoreSettingsToConfig(); // adelikat: I Think by reordering things, this isn't necessary anymore CloseGame(); - Global.Emulator.Dispose(); + + //Global.Emulator.Dispose(); // CloseGame() already killed and disposed the emulator; this is killing the new one; that's bad var nextComm = CreateCoreComm(); CoreFileProvider.SyncCoreCommInputSignals(nextComm); @@ -3242,6 +3243,8 @@ namespace BizHawk.Client.EmuHawk Global.ActiveController = Global.NullControls; Global.AutoFireController = Global.AutofireNullControls; + RewireSound(); + // adelikat: TODO: Ugly hack! But I don't know a way around this yet. if (!(Global.MovieSession.Movie is TasMovie)) {