ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #691 from Armada651/veto_fix 

CFrame: Handle close events that can't be vetoed.
This commit is contained in:
shuffle2 2014-08-12 14:46:01 -07:00
parent d1702b1160 e07c06cb16
commit d704ebdb40
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinWX/Frame.cpp
View File

@ -507,7 +507,10 @@ void CFrame::OnClose(wxCloseEvent& event)
if (Core::GetState() != Core::CORE_UNINITIALIZED) if (Core::GetState() != Core::CORE_UNINITIALIZED)
{ {
DoStop(); DoStop();
if (event.CanVeto())
{
event.Veto(); event.Veto();
}
return; return;
} }

3
Source/Core/DolphinWX/FrameTools.cpp
View File

@ -806,7 +806,10 @@ void CFrame::OnRenderParentClose(wxCloseEvent& event)
if (Core::GetState() != Core::CORE_UNINITIALIZED) if (Core::GetState() != Core::CORE_UNINITIALIZED)
{ {
DoStop(); DoStop();
if (event.CanVeto())
{
event.Veto(); event.Veto();
}
return; return;
} }