frontend: Adjust shutdown logic more

Author: Warchamp7

frontend/OBSApp.cpp

@@ -1267,20 +1267,6 @@ bool OBSApp::OBSInit()
 
 	mainWindow->setAttribute(Qt::WA_DeleteOnClose, true);
 
-#ifndef __APPLE__
-	connect(QApplication::instance(), &QApplication::aboutToQuit, this, [this]() {
-		if (mainWindow) {
-			QPointer<OBSBasic> basicWindow = static_cast<OBSBasic *>(mainWindow.get());
-
-			basicWindow->closeWindow();
-		}
-
-		if (libobs_initialized) {
-			applicationShutdown();
-		}
-	});
-#endif
-
 	mainWindow->OBSInit();
 
 	connect(OBSBasic::Get(), &OBSBasic::mainWindowClosed, crashHandler_.get(),

frontend/utility/NativeEventFilter_Windows.cpp

@@ -37,16 +37,16 @@ bool NativeEventFilter::nativeEventFilter(const QByteArray &eventType, void *mes
 
 		switch (msg->message) {
 		case WM_QUERYENDSESSION:
-			main->saveAll();
-			if (msg->lParam == ENDSESSION_CRITICAL) {
-				break;
+			if (msg->lParam & ENDSESSION_CRITICAL) {
+				main->saveAll();
+				return false;
 			}
 
 			if (main->shouldPromptForClose()) {
 				if (result) {
 					*result = FALSE;
 				}
-				QTimer::singleShot(1, main, &OBSBasic::close);
+				QMetaObject::invokeMethod(main, "close", Qt::QueuedConnection);
 				return true;
 			}
 

frontend/widgets/OBSBasic.cpp

@@ -1385,12 +1385,7 @@ void OBSBasic::OnFirstLoad()
 		on_actionViewCurrentLog_triggered();
 }
 
-OBSBasic::~OBSBasic()
-{
-	if (!isClosing()) {
-		closeWindow();
-	}
-}
+OBSBasic::~OBSBasic() {}
 
 void OBSBasic::applicationShutdown() noexcept
 {