v1.6.2.1 changes

amakvana · Oct 10, 2023 · 8322173 · 8322173
1 parent a9aeb58
commit 8322173
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 <br>
 
+## [1.6.2.1] - 2023-10-10
+
+### Fixed
+
+- [Issue #43](https://github.com/amakvana/EzYuzu/issues/43) - Race condition which caused EzYuzu to crash when `Launch Yuzu After Update` was checked - thanks [@DebugDax](https://github.com/amakvana/EzYuzu/issues/43), [@Gwouigwoui](https://github.com/amakvana/EzYuzu/issues/43)
+
+<br>
+
 ## [1.6.2.0] - 2023-10-08
 
 ### Added

diff --git a/source/EzYuzu/Properties/AssemblyInfo.cs b/source/EzYuzu/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.6.2.0")]
-[assembly: AssemblyFileVersion("1.6.2.0")]
+[assembly: AssemblyVersion("1.6.2.1")]
+[assembly: AssemblyFileVersion("1.6.2.1")]
 [assembly: SupportedOSPlatform("windows")]
diff --git a/source/EzYuzu/frmMain.cs b/source/EzYuzu/frmMain.cs
@@ -54,13 +54,7 @@ private async void FrmMain_LoadAsync(object sender, EventArgs e)
 
                 // launch Yuzu if install up to date and option checked 
                 if (installationState == YuzuInstallationState.LatestVersionInstalled && launchYuzuAfterUpdateToolStripMenuItem.Checked)
-                {
-                    Process.Start(new ProcessStartInfo(Path.Combine(txtYuzuLocation.Text, "yuzu.exe"))
-                    {
-                        UseShellExecute = true
-                    })?.Dispose();
-                    Application.Exit();
-                }
+                    LaunchYuzu(txtYuzuLocation.Text);
             }
 
             formHasLoaded = true;
@@ -126,14 +120,7 @@ private async void BtnBrowse_ClickAsync(object sender, EventArgs e)
 
             // launch Yuzu if install up to date and option checked 
             if (installationState == YuzuInstallationState.LatestVersionInstalled && launchYuzuAfterUpdateToolStripMenuItem.Checked)
-            {
-                string exeToLaunch = enableHDRToolStripMenuItem.Checked ? "cemu.exe" : "yuzu.exe";
-                Process.Start(new ProcessStartInfo(Path.Combine(txtYuzuLocation.Text, exeToLaunch))
-                {
-                    UseShellExecute = true
-                })?.Dispose();
-                Application.Exit();
-            }
+                LaunchYuzu(txtYuzuLocation.Text);
         }
 
         private async void BtnProcess_ClickAsync(object sender, EventArgs e)
@@ -204,15 +191,8 @@ private async void BtnProcess_ClickAsync(object sender, EventArgs e)
 
             // launch Yuzu if option checked 
             if (launchYuzuAfterUpdateToolStripMenuItem.Checked)
-            {
-                string exeToLaunch = enableHDRToolStripMenuItem.Checked ? "cemu.exe" : "yuzu.exe";
-                Process.Start(new ProcessStartInfo(Path.Combine(yuzuLocation, exeToLaunch))
-                {
-                    UseShellExecute = true
-                })?.Dispose();
-                Application.Exit();
-            }
-
+                LaunchYuzu(yuzuLocation);
+
             // if "Exit After Update" is selected, exit app 
             if (exitAfterUpdateToolStripMenuItem.Checked)
                 Application.Exit();
@@ -314,9 +294,7 @@ private void LoadApplicationSettings(bool isLaunchedInSafeMode)
 
             // safe mode ui adjustments 
             if (isLaunchedInSafeMode)
-            {
                 this.Text = $"{this.Text} - Safe Mode";
-            }
 
             if (!File.Exists("EzYuzu.settings.json"))
                 return;
@@ -547,5 +525,32 @@ private static void RenameFile(string path, string oldFileName, string newFileNa
                 renamed = true;
             }
         }
+
+        private static void LaunchYuzu(string yuzuLocationPath)
+        {
+            // wait for executable to exist
+            bool executableExists = false;
+            string executableToLaunch = "";
+            string[] possibleExecutables = { "yuzu.exe", "cemu.exe" };
+            while (!executableExists)
+            {
+                foreach (var executable in possibleExecutables)
+                {
+                    if (File.Exists(Path.Combine(yuzuLocationPath, executable)))
+                    {
+                        executableExists = true;
+                        executableToLaunch = executable;
+                        break;
+                    }
+                }
+            }
+
+            // executable now exists, run it 
+            Process.Start(new ProcessStartInfo(Path.Combine(yuzuLocationPath, executableToLaunch))
+            {
+                UseShellExecute = true
+            })?.Dispose();
+            Application.Exit();
+        }
     }
 }