Merge pull request #4302 from leoetlino/graceful-fixes

Minor fixes to graceful shutdown

Source/Core/DolphinWX/Frame.cpp

@@ -615,8 +615,7 @@ void CFrame::OnClose(wxCloseEvent& event)
       event.Veto();
     }
     // Tell OnStopped to resubmit the Close event
-    if (m_confirmStop)
-      m_bClosing = true;
+    m_bClosing = true;
     return;
   }
 
@@ -1714,5 +1713,6 @@ void CFrame::HandleSignal(wxTimerEvent& event)
 {
   if (!s_shutdown_signal_received.TestAndClear())
     return;
+  m_bClosing = true;
   Close();
 }