Merge pull request #1700 from nicolasnoble/signals

Adding signals support.

Author: nicolasnoble

src/main/main.cc

@@ -17,6 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
+#include <csignal>
 #include <filesystem>
 #include <iostream>
 #include <map>
@@ -191,10 +192,12 @@ int pcsxMain(int argc, char **argv) {
     // Creating the "system" global object first, making sure anything logging-related is
     // enabled as much as possible.
     SystemImpl *system = new SystemImpl(args);
+    PCSX::g_system = system;
+    auto sigint = std::signal(SIGINT, [](auto signal) { PCSX::g_system->quit(-1); });
+    auto sigterm = std::signal(SIGTERM, [](auto signal) { PCSX::g_system->quit(-1); });
     const auto &logfileArgOpt = args.get<std::string>("logfile");
     const PCSX::u8string logfileArg = MAKEU8(logfileArgOpt.has_value() ? logfileArgOpt->c_str() : "");
     if (!logfileArg.empty()) system->useLogfile(logfileArg);
-    PCSX::g_system = system;
     std::filesystem::path self = PCSX::BinPath::getExecutablePath();
     std::filesystem::path binDir = std::filesystem::absolute(self).parent_path();
     system->setBinDir(binDir);
@@ -383,7 +386,7 @@ runner.init({
         // First, set up a closer. This makes sure that everything is shut down gracefully,
         // in the right order, once we exit the scope. This is because of how we're still
         // allowing exceptions to occur.
-        Cleaner cleaner([&emulator, &system, &exitCode, luacovEnabled]() {
+        Cleaner cleaner([&emulator, &system, &exitCode, luacovEnabled, sigint, sigterm]() {
             emulator->m_spu->close();
             emulator->m_cdrom->clearIso();
 
@@ -402,6 +405,8 @@ runner.init({
             PCSX::g_emulator = nullptr;
 
             exitCode = system->exitCode();
+            std::signal(SIGINT, sigint);
+            std::signal(SIGTERM, sigterm);
             delete system;
             PCSX::g_system = nullptr;
         });