Fix quitting issue again

src/core/system.h

@@ -166,6 +166,7 @@
     bool running() { return m_running; }
     const bool *runningPtr() { return &m_running; }
     bool quitting() { return m_quitting; }
+    bool terminating() { return m_terminating; }
     int exitCode() { return m_exitCode; }
     bool emergencyExit() { return m_emergencyExit; }
     [[gnu::cold]] void pause(bool exception = false) {
@@ -174,11 +175,16 @@
         m_eventBus->signal(Events::ExecutionFlow::Pause{exception});
     }
     void resume() {
-        if (m_running) return;
+        if (m_running || m_terminating) return;
         m_running = true;
         m_eventBus->signal(Events::ExecutionFlow::Run{});
     }
     virtual void testQuit(int code) = 0;
+    [[gnu::cold]] void terminateSignalSafe() {
+        // about the only thing signal handlers can do safely is switch a flag
+        m_terminating = true;
+        m_running = false;
+    }
     [[gnu::cold]] void quit(int code = 0) {
         m_quitting = true;
         pause();
@@ -259,6 +265,7 @@
     std::string m_currentLocale;
     bool m_running = false;
     bool m_quitting = false;
+    bool m_terminating = false;
     int m_exitCode = 0;
     struct LocaleInfo {
         const std::string filename;

src/main/main.cc

@@ -1,4 +1,4 @@
 /***************************************************************************
  *   Copyright (C) 2019 PCSX-Redux authors                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -166,6 +166,10 @@
     std::function<void()> f;
 };
 
+void handleSignal(int signal) {
+    PCSX::g_system->terminateSignalSafe();
+}
+
 int pcsxMain(int argc, char **argv) {
     ZoneScoped;
     // Command line arguments are parsed after this point.
@@ -193,11 +197,10 @@
     // enabled as much as possible.
     SystemImpl *system = new SystemImpl(args);
     PCSX::g_system = system;
-    static std::atomic_bool scheduledQuit = false;
-    auto sigint = std::signal(SIGINT, [](auto signal) { scheduledQuit = true; });
-    auto sigterm = std::signal(SIGTERM, [](auto signal) { scheduledQuit = true; });
+    auto sigint = std::signal(SIGINT, handleSignal);
+    auto sigterm = std::signal(SIGTERM, handleSignal);
 #ifndef _WIN32
-    signal(SIGPIPE, SIG_IGN);
+    std::signal(SIGPIPE, SIG_IGN);
 #endif
     const auto &logfileArgOpt = args.get<std::string>("logfile");
     const PCSX::u8string logfileArg = MAKEU8(logfileArgOpt.has_value() ? logfileArgOpt->c_str() : "");
@@ -455,10 +458,10 @@
                     // when the emulator is paused.
                     s_ui->update();
                 }
-                if (scheduledQuit) {
-                    PCSX::g_system->quit(-1);
-                    return exitCode;
-                }
+				if (system->terminating()) {
+					PCSX::g_system->quit(-1);
+					return exitCode;
+				}
             }
         } catch (...) {
             // This will ensure we don't do certain cleanups that are awaiting other tasks,