From 8c12fe742cb8bec6e33f32acc2380302011073d9 Mon Sep 17 00:00:00 2001
From: Travis Nickles <ryochan7@protonmail.com>
Date: Mon, 28 Oct 2019 20:28:42 -0500
Subject: [PATCH] Tweak update checker routine

Simplify a bit. Result feels more responsive
---
 DS4Windows/DS4Forms/DS4Form.cs | 70 ++++++++++++++++++++++++----------
 1 file changed, 49 insertions(+), 21 deletions(-)

diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs
index 7a2041d..76af3bc 100644
--- a/DS4Windows/DS4Forms/DS4Form.cs
+++ b/DS4Windows/DS4Forms/DS4Form.cs
@@ -962,9 +962,14 @@ namespace DS4Windows.Forms
             bool launchUpdate = false;
             if (!string.IsNullOrWhiteSpace(newversion) && version.Replace(',', '.').CompareTo(newversion) != 0)
             {
-                if ((DialogResult)this.Invoke(new Func<DialogResult>(() => {
-                    return MessageBox.Show(Properties.Resources.DownloadVersion.Replace("*number*", newversion),
-Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question); })) == DialogResult.Yes)
+                DialogResult result = DialogResult.No;
+                this.Invoke((System.Action)(() =>
+                {
+                    MessageBox.Show(Properties.Resources.DownloadVersion.Replace("*number*", newversion),
+Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+                }));
+
+                if (result == DialogResult.Yes)
                 {
                     launchUpdate = true;
                     if (!File.Exists(exepath + "\\DS4Updater.exe") || (File.Exists(exepath + "\\DS4Updater.exe")
@@ -986,14 +991,21 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
 
                     if (launchUpdate)
                     {
-                        Process p = new Process();
-                        p.StartInfo.FileName = exepath + "\\DS4Updater.exe";
-                        p.StartInfo.Arguments = "-autolaunch";
-                        if (AdminNeeded())
-                            p.StartInfo.Verb = "runas";
+                        using (Process p = new Process())
+                        {
+                            p.StartInfo.FileName = exepath + "\\DS4Updater.exe";
+                            p.StartInfo.Arguments = "-autolaunch";
+                            if (AdminNeeded())
+                                p.StartInfo.Verb = "runas";
 
-                        try { p.Start(); Close(); }
-                        catch { }
+                            try { p.Start(); }
+                            catch (Exception) { launchUpdate = false; }
+                        }
+                    }
+
+                    if (launchUpdate)
+                    {
+                        Close();
                     }
                 }
                 else
@@ -2356,14 +2368,19 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
             FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
             string version2 = fvi.FileVersion;
             string newversion2 = File.ReadAllText(appdatapath + "\\version.txt").Trim();
+            bool launchUpdate = false;
             if (!string.IsNullOrWhiteSpace(newversion2) && version2.Replace(',', '.').CompareTo(newversion2) != 0)
             {
-                if ((DialogResult)this.Invoke(new Func<DialogResult>(() =>
+                DialogResult result = DialogResult.No;
+                this.Invoke((System.Action)(() =>
                 {
-                    return MessageBox.Show(Properties.Resources.DownloadVersion.Replace("*number*", newversion2),
-                    Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question);
-                })) == DialogResult.Yes)
+                    MessageBox.Show(Properties.Resources.DownloadVersion.Replace("*number*", newversion2),
+Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+                }));
+
+                if (result == DialogResult.Yes)
                 {
+                    launchUpdate = true;
                     if (!File.Exists(exepath + "\\DS4Updater.exe") || (File.Exists(exepath + "\\DS4Updater.exe")
                          && (FileVersionInfo.GetVersionInfo(exepath + "\\DS4Updater.exe").FileVersion.CompareTo(UPDATER_VERSION) != 0)))
                     {
@@ -2375,17 +2392,28 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
                         {
                             this.BeginInvoke((System.Action)(() => MessageBox.Show(Properties.Resources.PleaseDownloadUpdater)));
                             Process.Start($"https://github.com/Ryochan7/DS4Updater/releases/download/v{UPDATER_VERSION}/{updaterExe}");
+                            launchUpdate = false;
                         }
                     }
 
-                    Process p = new Process();
-                    p.StartInfo.FileName = exepath + "\\DS4Updater.exe";
-                    p.StartInfo.Arguments = "-autolaunch";
-                    if (AdminNeeded())
-                        p.StartInfo.Verb = "runas";
+                    if (launchUpdate)
+                    {
+                        using (Process p = new Process())
+                        {
+                            p.StartInfo.FileName = exepath + "\\DS4Updater.exe";
+                            p.StartInfo.Arguments = "-autolaunch";
+                            if (AdminNeeded())
+                                p.StartInfo.Verb = "runas";
 
-                    try { p.Start(); Close(); }
-                    catch { }
+                            try { p.Start(); }
+                            catch (Exception) { launchUpdate = false; }
+                        }
+                    }
+
+                    if (launchUpdate)
+                    {
+                        Close();
+                    }
                 }
                 else
                     File.Delete(appdatapath + "\\version.txt");