From 1ead45ca04880c6db8a1eb6047e184d1cd3710a2 Mon Sep 17 00:00:00 2001 From: John Peterson Date: Tue, 3 Feb 2009 09:39:35 +0000 Subject: [PATCH] Wiimote: Fixed slight oversight in the last commit git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2086 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp index a625170f73..7ba1d7140e 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp @@ -170,8 +170,15 @@ void ConfigDialog::CloseClick(wxCommandEvent& event) switch(event.GetId()) { case ID_CLOSE: - WiiMoteReal::g_Shutdown = true; - m_ShutDownTimer->Start(10); + if(!g_EmulatorRunning) + { + WiiMoteReal::g_Shutdown = true; + m_ShutDownTimer->Start(10); + } + else + { + Close(); + } break; case ID_APPLY: SaveFile();