mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 20:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #691 from Armada651/veto_fix

Browse source 
CFrame: Handle close events that can't be vetoed.
This commit is contained in:
shuffle2 2014-08-12 14:46:01 -07:00
commit d704ebdb40
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
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();
event.Veto(); if (event.CanVeto())
{
event.Veto();
}
return; return;
} }

5
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();
event.Veto(); if (event.CanVeto())
{
event.Veto();
}
return; return;
} }