From 7e091529aa1be63b1648a6332581f0d38696dab7 Mon Sep 17 00:00:00 2001 From: Sour Date: Fri, 22 Mar 2019 21:31:07 -0400 Subject: [PATCH] Fixed crash when exiting emulator (shortcut handler must be deleted before deleting the key manager) --- InteropDLL/EmuApiWrapper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/InteropDLL/EmuApiWrapper.cpp b/InteropDLL/EmuApiWrapper.cpp index f0dc06e..8f5a866 100644 --- a/InteropDLL/EmuApiWrapper.cpp +++ b/InteropDLL/EmuApiWrapper.cpp @@ -146,16 +146,16 @@ extern "C" { DllExport void __stdcall Release() { + _shortcutKeyHandler.reset(); + _console->Stop(true); - + _renderer.reset(); _soundManager.reset(); _keyManager.reset(); _console->Release(); - _console.reset(); - - _shortcutKeyHandler.reset(); + _console.reset(); } DllExport INotificationListener* __stdcall RegisterNotificationCallback(NotificationListenerCallback callback)