diff options
| author | John Peterson <jpeterson57@gmail.com> | 2009-02-03 09:39:35 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2009-02-03 09:39:35 +0000 |
| commit | 1ead45ca04880c6db8a1eb6047e184d1cd3710a2 (patch) | |
| tree | 02b15981203b3076036473f626f0476cdb1725d5 | |
| parent | f3e5f06deffb0495d298a01e158a35cdb5295212 (diff) | |
Wiimote: Fixed slight oversight in the last commit
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2086 8ced0084-cf51-0410-be5f-012b33b47a6e
| -rw-r--r-- | Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp | 11 |
1 files 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(); |