frontend: Adjust application shutdown logic

frontend/OBSApp.cpp

@@ -42,9 +42,8 @@
 #include <QFile>
 #endif
 
-#ifdef _WIN32
 #include <QSessionManager>
-#else
+#ifndef _WIN32
 #include <QSocketNotifier>
 #endif
 
@@ -78,6 +77,7 @@ extern string opt_starting_profile;
 
 #ifndef _WIN32
 int OBSApp::sigintFd[2];
+int OBSApp::sigtermFd[2];
 #endif
 
 // GPU hint exports for AMD/NVIDIA laptops
@@ -868,6 +868,8 @@ OBSApp::OBSApp(int &argc, char **argv, profiler_name_store_t *store)
 	  profilerNameStore(store),
 	  appLaunchUUID_(QUuid::createUuid())
 {
+	installNativeEventFilter(new OBS::NativeEventFilter);
+
 	/* fix float handling */
 #if defined(Q_OS_UNIX)
 	if (!setlocale(LC_NUMERIC, "C"))
@@ -879,9 +881,14 @@ OBSApp::OBSApp(int &argc, char **argv, profiler_name_store_t *store)
 	socketpair(AF_UNIX, SOCK_STREAM, 0, sigintFd);
 	snInt = new QSocketNotifier(sigintFd[1], QSocketNotifier::Read, this);
 	connect(snInt, &QSocketNotifier::activated, this, &OBSApp::ProcessSigInt);
-#else
-	connect(qApp, &QGuiApplication::commitDataRequest, this, &OBSApp::commitData);
+
+	/* Handle SIGTERM */
+	socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermFd);
+	snTerm = new QSocketNotifier(sigtermFd[1], QSocketNotifier::Read, this);
+	connect(snTerm, &QSocketNotifier::activated, this, &OBSApp::ProcessSigTerm);
 #endif
+	connect(qApp, &QGuiApplication::commitDataRequest, this, &OBSApp::commitData, Qt::DirectConnection);
+
 	if (multi) {
 		crashHandler_ = std::make_unique<OBS::CrashHandler>();
 	} else {
@@ -1229,7 +1236,20 @@ bool OBSApp::OBSInit()
 	mainWindow = new OBSBasic();
 
 	mainWindow->setAttribute(Qt::WA_DeleteOnClose, true);
-	connect(mainWindow, &OBSBasic::destroyed, this, &OBSApp::quit);
+
+	connect(QApplication::instance(), &QApplication::aboutToQuit, this, [this]() {
+		crashHandler_->applicationShutdownHandler();
+
+		/* Ensure OBSMainWindow gets closed */
+		if (mainWindow) {
+			mainWindow->close();
+			delete mainWindow;
+		}
+
+		if (libobs_initialized) {
+			applicationShutdown();
+		}
+	});
 
 	mainWindow->OBSInit();
 
@@ -1748,6 +1768,14 @@ void OBSApp::SigIntSignalHandler(int s)
 	char a = 1;
 	send(sigintFd[0], &a, sizeof(a), 0);
 }
+
+void OBSApp::SigTermSignalHandler(int s)
+{
+	UNUSED_PARAMETER(s);
+
+	char a = 1;
+	send(sigtermFd[0], &a, sizeof(a), 0);
+}
 #endif
 
 void OBSApp::ProcessSigInt(void)
@@ -1759,20 +1787,39 @@ void OBSApp::ProcessSigInt(void)
 	recv(sigintFd[1], &tmp, sizeof(tmp), 0);
 
 	OBSBasic *main = OBSBasic::Get();
-	if (main)
+	if (main) {
+		main->saveAll();
 		main->close();
+	}
+#endif
+}
+
+void OBSApp::ProcessSigTerm(void)
+{
+#ifndef _WIN32
+	char tmp;
+	recv(sigtermFd[1], &tmp, sizeof(tmp), 0);
+
+	OBSBasic *main = OBSBasic::Get();
+	if (main) {
+		main->saveAll();
+	}
+
+	quit();
 #endif
 }
 
-#ifdef _WIN32
 void OBSApp::commitData(QSessionManager &manager)
 {
-	if (auto main = App()->GetMainWindow()) {
-		QMetaObject::invokeMethod(main, "close", Qt::QueuedConnection);
-		manager.cancel();
+	OBSBasic *main = OBSBasic::Get();
+	if (main) {
+		main->saveAll();
+
+		if (manager.allowsInteraction() && main->shouldPromptForClose()) {
+			manager.cancel();
+		}
 	}
 }
-#endif
 
 void OBSApp::applicationShutdown() noexcept
 {
@@ -1784,6 +1831,10 @@ void OBSApp::applicationShutdown() noexcept
 	delete snInt;
 	close(sigintFd[0]);
 	close(sigintFd[1]);
+
+	delete snTerm;
+	close(sigtermFd[0]);
+	close(sigtermFd[1]);
 #endif
 
 #ifdef __APPLE__

frontend/OBSApp.hpp

@@ -18,13 +18,15 @@
 #pragma once
 
 #include <utility/OBSTheme.hpp>
+#include <utility/NativeEventFilter.hpp>
 #include <widgets/OBSMainWindow.hpp>
 
 #include <obs-frontend-api.h>
 #include <util/platform.h>
 #include <util/profiler.hpp>
 #include <util/util.hpp>
 
+#include <QAbstractNativeEventFilter>
 #include <QApplication>
 #include <QPalette>
 #include <QPointer>
@@ -61,6 +63,8 @@ struct UpdateBranch {
 class OBSApp : public QApplication {
 	Q_OBJECT
 
+	friend class OBS::NativeEventFilter;
+
 private:
 	QUuid appLaunchUUID_;
 	std::unique_ptr<OBS::CrashHandler> crashHandler_;
@@ -117,12 +121,13 @@ class OBSApp : public QApplication {
 #ifndef _WIN32
 	static int sigintFd[2];
 	QSocketNotifier *snInt = nullptr;
-#else
-private slots:
-	void commitData(QSessionManager &manager);
+
+	static int sigtermFd[2];
+	QSocketNotifier *snTerm = nullptr;
 #endif
 
 private slots:
+	void commitData(QSessionManager &manager);
 	void addLogLine(int logLevel, const QString &message);
 	void themeFileChanged(const QString &);
 	void applicationShutdown() noexcept;
@@ -212,6 +217,7 @@ private slots:
 	inline void PopUITranslation() { translatorHooks.pop_front(); }
 #ifndef _WIN32
 	static void SigIntSignalHandler(int);
+	static void SigTermSignalHandler(int);
 #endif
 
 	void loadAppModules(struct obs_module_failure_info &mfi);
@@ -222,6 +228,7 @@ private slots:
 public slots:
 	void Exec(VoidFunc func);
 	void ProcessSigInt();
+	void ProcessSigTerm();
 
 signals:
 	void logLineAdded(int logLevel, const QString &message);

frontend/cmake/feature-idian-playground.cmake

@@ -3,7 +3,7 @@ option(ENABLE_IDIAN_PLAYGROUND "Enable building custom idian widget demo window"
 if(ENABLE_IDIAN_PLAYGROUND)
   target_sources(
     obs-studio
-    PRIVATE forms/OBSIdianPlayground.ui dialogs/OBSIdianPlayground.hpp dialogs/OBSIdianPlayground.cpp
+    PRIVATE dialogs/OBSIdianPlayground.hpp dialogs/OBSIdianPlayground.cpp forms/OBSIdianPlayground.ui
   )
   target_enable_feature(obs-studio "Idian Playground" ENABLE_IDIAN_PLAYGROUND)
 else()

frontend/cmake/feature-macos-update.cmake

@@ -9,16 +9,16 @@ endif()
 target_sources(
   obs-studio
   PRIVATE
+    utility/WhatsNewBrowserInitThread.cpp
+    utility/WhatsNewBrowserInitThread.hpp
+    utility/WhatsNewInfoThread.cpp
+    utility/WhatsNewInfoThread.hpp
     utility/crypto-helpers-mac.mm
     utility/crypto-helpers.hpp
     utility/models/branches.hpp
     utility/models/whatsnew.hpp
     utility/update-helpers.cpp
     utility/update-helpers.hpp
-    utility/WhatsNewBrowserInitThread.cpp
-    utility/WhatsNewBrowserInitThread.hpp
-    utility/WhatsNewInfoThread.cpp
-    utility/WhatsNewInfoThread.hpp
 )
 
 target_link_libraries(

frontend/cmake/feature-whatsnew.cmake

@@ -20,15 +20,15 @@ if(ENABLE_WHATSNEW AND TARGET OBS::browser-panels)
     target_sources(
       obs-studio
       PRIVATE
+        utility/WhatsNewBrowserInitThread.cpp
+        utility/WhatsNewBrowserInitThread.hpp
+        utility/WhatsNewInfoThread.cpp
+        utility/WhatsNewInfoThread.hpp
         utility/crypto-helpers-mbedtls.cpp
         utility/crypto-helpers.hpp
         utility/models/whatsnew.hpp
         utility/update-helpers.cpp
         utility/update-helpers.hpp
-        utility/WhatsNewBrowserInitThread.cpp
-        utility/WhatsNewBrowserInitThread.hpp
-        utility/WhatsNewInfoThread.cpp
-        utility/WhatsNewInfoThread.hpp
     )
   endif()
 

frontend/cmake/os-freebsd.cmake

@@ -1,6 +1,10 @@
 target_sources(
   obs-studio
-  PRIVATE utility/platform-x11.cpp utility/system-info-posix.cpp utility/CrashHandler_FreeBSD.cpp
+  PRIVATE
+    utility/CrashHandler_FreeBSD.cpp
+    utility/NativeEventFilter.cpp
+    utility/platform-x11.cpp
+    utility/system-info-posix.cpp
 )
 target_compile_definitions(obs-studio PRIVATE OBS_INSTALL_PREFIX="${OBS_INSTALL_PREFIX}")
 target_link_libraries(obs-studio PRIVATE Qt::GuiPrivate Qt::DBus procstat)

frontend/cmake/os-linux.cmake

@@ -1,4 +1,11 @@
-target_sources(obs-studio PRIVATE utility/platform-x11.cpp utility/system-info-posix.cpp utility/CrashHandler_Linux.cpp)
+target_sources(
+  obs-studio
+  PRIVATE
+    utility/CrashHandler_Linux.cpp
+    utility/NativeEventFilter.cpp
+    utility/platform-x11.cpp
+    utility/system-info-posix.cpp
+)
 target_compile_definitions(
   obs-studio
   PRIVATE OBS_INSTALL_PREFIX="${OBS_INSTALL_PREFIX}" $<$<BOOL:${ENABLE_PORTABLE_CONFIG}>:ENABLE_PORTABLE_CONFIG>

frontend/cmake/os-macos.cmake

@@ -7,6 +7,7 @@ target_sources(
     dialogs/OBSPermissions.hpp
     forms/OBSPermissions.ui
     utility/CrashHandler_MacOS.mm
+    utility/NativeEventFilter.cpp
     utility/platform-osx.mm
     utility/system-info-macos.mm
 )

frontend/cmake/os-windows.cmake

@@ -25,6 +25,11 @@ target_sources(
     utility/AutoUpdateThread.cpp
     utility/AutoUpdateThread.hpp
     utility/CrashHandler_Windows.cpp
+    utility/NativeEventFilter_Windows.cpp
+    utility/WhatsNewBrowserInitThread.cpp
+    utility/WhatsNewBrowserInitThread.hpp
+    utility/WhatsNewInfoThread.cpp
+    utility/WhatsNewInfoThread.hpp
     utility/crypto-helpers-mbedtls.cpp
     utility/crypto-helpers.hpp
     utility/models/branches.hpp
@@ -33,10 +38,6 @@ target_sources(
     utility/system-info-windows.cpp
     utility/update-helpers.cpp
     utility/update-helpers.hpp
-    utility/WhatsNewBrowserInitThread.cpp
-    utility/WhatsNewBrowserInitThread.hpp
-    utility/WhatsNewInfoThread.cpp
-    utility/WhatsNewInfoThread.hpp
     utility/win-dll-blocklist.c
 )
 

frontend/cmake/ui-models.cmake

@@ -1 +1 @@
-target_sources(obs-studio PRIVATE models/SceneCollection.cpp models/SceneCollection.hpp models/Rect.cpp models/Rect.hpp)
+target_sources(obs-studio PRIVATE models/Rect.cpp models/Rect.hpp models/SceneCollection.cpp models/SceneCollection.hpp)

frontend/cmake/ui-qt.cmake

@@ -46,8 +46,8 @@ target_sources(
     forms/OBSMissingFiles.ui
     forms/OBSRemux.ui
     forms/StatusBarWidget.ui
-    forms/obs.qrc
     forms/PluginManagerWindow.ui
+    forms/obs.qrc
     forms/source-toolbar/browser-source-toolbar.ui
     forms/source-toolbar/color-source-toolbar.ui
     forms/source-toolbar/device-select-toolbar.ui

frontend/cmake/ui-utility.cmake

@@ -3,14 +3,11 @@ target_sources(
   PRIVATE
     utility/AdvancedOutput.cpp
     utility/AdvancedOutput.hpp
-    utility/audio-encoders.cpp
-    utility/audio-encoders.hpp
     utility/BaseLexer.hpp
     utility/BasicOutputHandler.cpp
     utility/BasicOutputHandler.hpp
     utility/CrashHandler.cpp
     utility/CrashHandler.hpp
-    utility/display-helpers.hpp
     utility/FFmpegCodec.cpp
     utility/FFmpegCodec.hpp
     utility/FFmpegFormat.cpp
@@ -22,19 +19,15 @@ target_sources(
     utility/GoLiveAPI_Network.hpp
     utility/GoLiveAPI_PostData.cpp
     utility/GoLiveAPI_PostData.hpp
-    utility/item-widget-helpers.cpp
-    utility/item-widget-helpers.hpp
     utility/MissingFilesModel.cpp
     utility/MissingFilesModel.hpp
     utility/MissingFilesPathItemDelegate.cpp
     utility/MissingFilesPathItemDelegate.hpp
-    utility/models/multitrack-video.hpp
     utility/MultitrackVideoError.cpp
     utility/MultitrackVideoError.hpp
     utility/MultitrackVideoOutput.cpp
     utility/MultitrackVideoOutput.hpp
-    utility/obf.c
-    utility/obf.h
+    utility/NativeEventFilter.hpp
     utility/OBSCanvas.cpp
     utility/OBSCanvas.hpp
     utility/OBSEventFilter.hpp
@@ -44,7 +37,6 @@ target_sources(
     utility/OBSThemeVariable.hpp
     utility/OBSTranslator.cpp
     utility/OBSTranslator.hpp
-    utility/platform.hpp
     utility/QuickTransition.cpp
     utility/QuickTransition.hpp
     utility/RemoteTextThread.cpp
@@ -64,10 +56,19 @@ target_sources(
     utility/SimpleOutput.hpp
     utility/StartMultiTrackVideoStreamingGuard.hpp
     utility/SurfaceEventFilter.hpp
-    utility/system-info.hpp
-    utility/undo_stack.cpp
-    utility/undo_stack.hpp
     utility/VCamConfig.hpp
     utility/VolumeMeterTimer.cpp
     utility/VolumeMeterTimer.hpp
+    utility/audio-encoders.cpp
+    utility/audio-encoders.hpp
+    utility/display-helpers.hpp
+    utility/item-widget-helpers.cpp
+    utility/item-widget-helpers.hpp
+    utility/models/multitrack-video.hpp
+    utility/obf.c
+    utility/obf.h
+    utility/platform.hpp
+    utility/system-info.hpp
+    utility/undo_stack.cpp
+    utility/undo_stack.hpp
 )

frontend/docks/OBSDock.cpp

@@ -28,7 +28,7 @@ void OBSDock::closeEvent(QCloseEvent *event)
 	};
 
 	bool warned = config_get_bool(App()->GetUserConfig(), "General", "WarnedAboutClosingDocks");
-	if (!OBSBasic::Get()->Closing() && !warned) {
+	if (!OBSBasic::Get()->isClosing() && !warned) {
 		QMetaObject::invokeMethod(App(), "Exec", Qt::QueuedConnection, Q_ARG(VoidFunc, msgBox));
 	}