diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2014-08-12 14:46:01 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2014-08-12 14:46:01 -0700 |
| commit | d704ebdb40249398300d984293d10acaaa2a49d5 (patch) | |
| tree | 9887f763ebb5565b2869734c27bd885e925d1a08 /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | d1702b1160d88e2dd230cb28ebc21b8bec8df55e (diff) | |
| parent | e07c06cb16d13dace0b06995155be1b3770d5726 (diff) | |
Merge pull request #691 from Armada651/veto_fix
CFrame: Handle close events that can't be vetoed.
Diffstat (limited to 'Source/Core/DolphinWX/FrameTools.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/FrameTools.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 7be149acc0..766c1bd48d 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -806,7 +806,10 @@ void CFrame::OnRenderParentClose(wxCloseEvent& event) if (Core::GetState() != Core::CORE_UNINITIALIZED) { DoStop(); - event.Veto(); + if (event.CanVeto()) + { + event.Veto(); + } return; } |