diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 915341f845..c118533625 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -507,7 +507,10 @@ void CFrame::OnClose(wxCloseEvent& event) if (Core::GetState() != Core::CORE_UNINITIALIZED) { DoStop(); - event.Veto(); + if (event.CanVeto()) + { + event.Veto(); + } return; } 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; }