Merge branch 'main' of ps.run:autorec

diff --git a/src/main.cpp b/src/main.cpp
index f7a1438538f435df29984ba1f7088a17485edc03..5e6eba365aedde9753b432083333e85dbe143258 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -160,10 +160,14 @@ void WriteGameExes()
 \r
 PROCESS_INFORMATION StartOBS()\r
 {\r
+  // delete .sentinel folder to stop obs from displaying\r
+  // error message on startup\r
+  system("del %appdata%\\obs-studio\\.sentinel /Q");\r
+\r
   PROCESS_INFORMATION pi;\r
   STARTUPINFOA sui;\r
   GetStartupInfoA(&sui);\r
-  CreateProcessA(nullptr, "C:\\Program Files\\obs-studio\\bin\\64bit\\obs64.exe --disable-shutdown-check",\r
+  CreateProcessA(nullptr, "C:\\Program Files\\obs-studio\\bin\\64bit\\obs64.exe",\r
     nullptr, nullptr, false, NORMAL_PRIORITY_CLASS, nullptr, "C:\\Program Files\\obs-studio\\bin\\64bit", &sui, &pi);\r
   return pi;\r
 }\r
@@ -245,6 +249,8 @@ WinMain(HINSTANCE hInstance,
   });\r
   window.handlers[WM_QUERYENDSESSION].push_back([&pi_obs](HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {\r
     StopOBS(pi_obs);\r
+  });  window.handlers[WM_ENDSESSION].push_back([&pi_obs](HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {\r
+    StopOBS(pi_obs);\r
   });\r
   window.handlers[WM_CLOSE].push_back([&pi_obs](HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {\r
     StopOBS(pi_obs);\r