Shutdown DiscordSocial before exiting main. Move Qt app into its own function.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Main.cpp

@@ -48,39 +48,14 @@ void set_working_directory(){
     }
 }
 
-int main(int argc, char *argv[]){
-    setup_crash_handler();
-
-#if defined(__linux) || defined(__APPLE__)
-    // By default Qt uses native menubar but this only works on Windows.
-    // We use menubar in our ButtonDiagram window to choose which controller's button mapping image to show.
-    // So we fix it by don't using native menubar on non-Windows OS.
-    QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
-#endif
 
-//#if QT_VERSION_MAJOR == 5 // AA_EnableHighDpiScaling is deprecated in Qt6
-//    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-//#endif
+int run_qt(int argc, char *argv[]){
     QApplication application(argc, argv);
 
-    Logger& logger = global_logger_tagged();
-
-    logger.log("================================================================================");
-    logger.log("Starting Program...");
-
-    qRegisterMetaType<size_t>("size_t");
-    qRegisterMetaType<uint8_t>("uint8_t");
-    qRegisterMetaType<std::string>("std::string");
-    qRegisterMetaType<Resolution>("Resolution");
-
-    OutputRedirector redirect_stdout(std::cout, "stdout", Color());
-    OutputRedirector redirect_stderr(std::cerr, "stderr", COLOR_RED);
-
     //  Preload all the cameras now so we don't hang the UI later on.
     get_all_cameras();
 
-    QDir().mkpath(QString::fromStdString(SETTINGS_PATH()));
-    QDir().mkpath(QString::fromStdString(SCREENSHOTS_PATH()));
+    Logger& logger = global_logger_tagged();
 
     //  Several novice developers struggled to build and run the program due to missing Resources folder.
     //  Add this check to pop a message box when Resources folder is missing.
@@ -116,6 +91,51 @@ int main(int argc, char *argv[]){
 
     check_new_version(logger);
 
+    set_working_directory();
+
+    //  Run this asynchronously to we don't block startup.
+    std::unique_ptr<AsyncTask> task = send_all_unsent_reports(logger, true);
+
+
+    MainWindow w;
+    w.show();
+    w.raise(); // bring the window to front on macOS
+    set_permissions(w);
+
+    return application.exec();
+}
+
+
+int main(int argc, char *argv[]){
+    setup_crash_handler();
+
+#if defined(__linux) || defined(__APPLE__)
+    // By default Qt uses native menubar but this only works on Windows.
+    // We use menubar in our ButtonDiagram window to choose which controller's button mapping image to show.
+    // So we fix it by don't using native menubar on non-Windows OS.
+    QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
+#endif
+
+//#if QT_VERSION_MAJOR == 5 // AA_EnableHighDpiScaling is deprecated in Qt6
+//    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+//#endif
+
+    Logger& logger = global_logger_tagged();
+
+    logger.log("================================================================================");
+    logger.log("Starting Program...");
+
+    qRegisterMetaType<size_t>("size_t");
+    qRegisterMetaType<uint8_t>("uint8_t");
+    qRegisterMetaType<std::string>("std::string");
+    qRegisterMetaType<Resolution>("Resolution");
+
+    OutputRedirector redirect_stdout(std::cout, "stdout", Color());
+    OutputRedirector redirect_stderr(std::cerr, "stderr", COLOR_RED);
+
+    QDir().mkpath(QString::fromStdString(SETTINGS_PATH()));
+    QDir().mkpath(QString::fromStdString(SCREENSHOTS_PATH()));
+
     Integration::DiscordIntegrationSettingsOption& discord_settings = GlobalSettings::instance().DISCORD->integration;
     if (discord_settings.run_on_start){
 #ifdef PA_DPP
@@ -130,23 +150,18 @@ int main(int argc, char *argv[]){
     }
 #endif
 
-    set_working_directory();
 
-    //  Run this asynchronously to we don't block startup.
-    std::unique_ptr<AsyncTask> task = send_all_unsent_reports(logger, true);
+    int ret = run_qt(argc, argv);
 
-    int ret = 0;
-    {
-        MainWindow w;
-        w.show();
-        w.raise(); // bring the window to front on macOS
-        set_permissions(w);
-        ret = application.exec();
-    }
 
     // Write program settings back to the json file.
     PERSISTENT_SETTINGS().write();
 
+
+#ifdef PA_SOCIAL_SDK
+    Integration::DiscordSocialSDK::DiscordSocial::instance().stop();
+#endif
+
 #ifdef PA_DPP
     Integration::DppClient::Client::instance().disconnect();
 #endif

SerialPrograms/Source/Integrations/DiscordSocial/DiscordSocial.cpp

@@ -17,6 +17,11 @@ DiscordSocial& DiscordSocial::instance(){
     return instance;
 }
 
+void DiscordSocial::stop(){
+    m_running.store(false, std::memory_order_release);
+    m_thread.join();
+    if (m_client) m_client.reset();
+}
 void DiscordSocial::run(){
     auto client = std::make_shared<Client>();
     if (!client){

SerialPrograms/Source/Integrations/DiscordSocial/DiscordSocial.h

@@ -16,13 +16,12 @@ class DiscordSocial{
 public:
     DiscordSocial() : m_running(false) {}
     ~DiscordSocial(){
-        m_running.store(false, std::memory_order_release);
-        m_thread.join();
-        if (m_client) m_client.reset();
+        stop();
     }
 
     static DiscordSocial& instance();
     void run();
+    void stop();
 
 private:
     Logger& logger();