Fixed non-launcher game execution and timing

Author: WombatFromHell

Changelog.md

@@ -1,4 +1,5 @@
-* 00a1dda (HEAD -> master, tag: v1.05b, origin/master) Add our Changelog.md output to our project build package
+* 72d4038 (HEAD -> master, tag: v1.05b, origin/master) Push git log output into Changelog.md before builds
+* 00a1dda Add our Changelog.md output to our project build package
 * a735a80 Make INI loading smarter when using old configs
 * 386d3e0 Refactoring of code base and more tuneables Major code cleanup, user tuneable wait times, loosened search timing of launcher process, launcher process is now optional, and pre-launcher event support in URI mode.
 * ce19cde Remove duplicated README and replace with a file link

OriginSteamOverlayLauncher/Program.cs

@@ -386,6 +386,7 @@ private static void ProcessLauncher(Settings setHnd)
 
                 launcherProc.StartInfo.UseShellExecute = true;
                 launcherProc.StartInfo.FileName = setHnd.LauncherPath;
+                launcherProc.StartInfo.WorkingDirectory = Directory.GetParent(setHnd.LauncherPath).ToString();
                 launcherProc.StartInfo.Arguments = setHnd.LauncherArgs;
                 Logger("OSOL", "Attempting to start the launcher, cmd: " + setHnd.LauncherPath);
                 launcherProc.Start();
@@ -423,11 +424,11 @@ private static void ProcessLauncher(Settings setHnd)
                     Logger("FATAL", "Cannot find main window handle of launcher process at PID [" + launcherProc.Id + "], perhaps the wrong launcher exe?");
                     return;
                 }
-            }// skip over the launcher if we're only launching a game path
 
-            // force the launcher window to activate before the game to avoid BPM hooking issues
-            Thread.Sleep(setHnd.PreGameOverlayWaitTime * 1000); // wait for the BPM overlay notification
-            BringToFront(launcherProc.MainWindowHandle);
+                // force the launcher window to activate before the game to avoid BPM hooking issues
+                Thread.Sleep(setHnd.PreGameOverlayWaitTime * 1000); // wait for the BPM overlay notification
+                BringToFront(launcherProc.MainWindowHandle);
+            }// skip over the launcher if we're only launching a game path
 
             /*
              * Game Post-Proxy Detection
@@ -437,6 +438,7 @@ private static void ProcessLauncher(Settings setHnd)
             {// only run game ourselves if the user asks
                 gameProc.StartInfo.UseShellExecute = true;
                 gameProc.StartInfo.FileName = setHnd.GamePath;
+                gameProc.StartInfo.WorkingDirectory = Directory.GetParent(setHnd.GamePath).ToString();
                 gameProc.StartInfo.Arguments = setHnd.GameArgs;
                 Logger("OSOL", "Launching game, cmd: " + setHnd.GamePath + " " + setHnd.GameArgs);
                 gameProc.Start();
@@ -467,7 +469,7 @@ private static void ProcessLauncher(Settings setHnd)
 
             int g_sanity_counter = 0;
             int gamePID = 0;
-            while (g_sanity_counter <= 300)
+            while (g_sanity_counter <= 300 && setHnd.LauncherPath != String.Empty)
             {// actively attempt to reacquire process, wait up to 5 mins
                 if (g_sanity_counter == 300)
                 {
@@ -504,15 +506,17 @@ private static void ProcessLauncher(Settings setHnd)
             /*
              * Post-Game Cleanup
              */
-            if (IsRunningPID(launcherProc.Id))
+            if (setHnd.LauncherPath != String.Empty && IsRunningPID(launcherProc.Id))
             {// found the launcher left after the game exited
                 Thread.Sleep(setHnd.PostGameWaitTime * 1000); // let Origin sync with the cloud
                 Logger("OSOL", "Game exited, killing launcher instance and cleaning up...");
                 KillProcTreeByName(launcherName);
-
-                // ask a non-async delegate to run a process after the game and launcher exit
-                ExecuteExternalElevated(setHnd.PostGameExec, setHnd.PostGameExecArgs);
             }
+            else
+                Logger("OSOL", "Game exited, cleaning up...");
+
+            // ask a non-async delegate to run a process after the game and launcher exit
+            ExecuteExternalElevated(setHnd.PostGameExec, setHnd.PostGameExecArgs);
         }
     }
 }