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
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -197,6 +197,7 @@ class CFrame : public wxFrame
|
||||
bool m_bNoDocking;
|
||||
bool m_bModalDialogOpen;
|
||||
bool m_bControlsCreated;
|
||||
wxMessageDialog *m_StopDlg;
|
||||
|
||||
char **drives;
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user