diff options
| author | Jules Blok <jules.blok@gmail.com> | 2014-07-29 11:26:19 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2014-07-29 12:36:10 +0200 |
| commit | e07c06cb16d13dace0b06995155be1b3770d5726 (patch) | |
| tree | 2187f35df22fce8d7a9f59525c26b6f8f785b91c /Source/Core/DolphinWX/FrameTools.cpp | |
| parent | 96cfbd1bb0e03cfdd58c6c9ffa96a5bd17f850f4 (diff) | |
CFrame: Handle close events that can't be vetoed.
This can happen during shutdown.
As long as we don't call event.Skip() the CFrame won't be closed yet, so even if we can't veto the shutdown will still happen in the correct order.
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 7da062645f..6fc1865c5a 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -836,7 +836,10 @@ void CFrame::OnRenderParentClose(wxCloseEvent& event) if (Core::GetState() != Core::CORE_UNINITIALIZED) { DoStop(); - event.Veto(); + if (event.CanVeto()) + { + event.Veto(); + } return; } |