diff options
| author | ayuanx <ayuanx@gmail.com> | 2010-01-20 07:47:41 +0000 |
|---|---|---|
| committer | ayuanx <ayuanx@gmail.com> | 2010-01-20 07:47:41 +0000 |
| commit | 82ccf1d34c76b2bd67f07eaae826d2501ed0bf72 (patch) | |
| tree | 3da929c7bb2c1c912666b1a4ec530fd5d1ba7017 /Source/Core | |
| parent | d70bb07580cb168963f37046f396faa38c0093ae (diff) | |
Fixes Issue 2070
Fixes Issue 1886
Fixes Issue 1519
Fixes wxWindow Destroy Issue
Quits DX9 full screen when a message box pops up
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4898 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Src/ConfigMain.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/Frame.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/Frame.h | 1 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/FrameTools.cpp | 11 |
4 files changed, 12 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 0c35829390..ad35ea99e7 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -135,6 +135,7 @@ void CConfigMain::UpdateGUI() // Disable the Core stuff on GeneralPage AlwaysHLE_BS2->Disable(); m_RadioJIT->Disable(); + m_RadioJITIL->Disable(); m_RadioInt->Disable(); CPUThread->Disable(); DSPThread->Disable(); diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp index 31d5327c37..8227dff367 100644 --- a/Source/Core/DolphinWX/Src/Frame.cpp +++ b/Source/Core/DolphinWX/Src/Frame.cpp @@ -179,7 +179,7 @@ CPanel::CPanel( if (dlg->ShowModal() == wxID_YES) GetUsbPointer()->AccessWiiMote(lParam | 0x100)->Activate(true); - delete dlg; + dlg->Destroy(); } return 0; } @@ -323,7 +323,7 @@ CFrame::CFrame(wxFrame* parent, , bRenderToMain(false), bFloatLogWindow(false), bFloatConsoleWindow(false) , HaveLeds(false), HaveSpeakers(false) , m_fLastClickTime(0), m_iLastMotionTime(0), LastMouseX(0), LastMouseY(0) - , m_bControlsCreated(false), bNoWiimoteMsg(false) + , m_bControlsCreated(false), bNoWiimoteMsg(false), m_StopDlg(NULL) #if wxUSE_TIMER , m_timer(this) #endif diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h index 011b64a329..9d7bf90aa5 100644 --- a/Source/Core/DolphinWX/Src/Frame.h +++ b/Source/Core/DolphinWX/Src/Frame.h @@ -197,6 +197,7 @@ class CFrame : public wxFrame bool m_bNoDocking; bool m_bModalDialogOpen; bool m_bControlsCreated; + wxMessageDialog *m_StopDlg; char **drives; diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index f6d7b8b31d..0130269c12 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -698,15 +698,20 @@ void CFrame::DoStop() // Ask for confirmation in case the user accidentally clicked Stop / Escape if (SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop) { - wxMessageDialog *dlg = new wxMessageDialog( + // Supress duplicate dialog boxes + if (m_StopDlg) + return; + + m_StopDlg = new wxMessageDialog( this, wxT("Do you want to stop the current emulation?"), wxT("Please confirm..."), wxYES_NO | wxSTAY_ON_TOP | wxICON_EXCLAMATION, wxDefaultPosition); - int Ret = dlg->ShowModal(); - delete dlg; + int Ret = m_StopDlg->ShowModal(); + m_StopDlg->Destroy(); + m_StopDlg = NULL; if (Ret == wxID_NO) return; } |