From 1f66d984cd7bc5380513bff6551516b7a764f3d0 Mon Sep 17 00:00:00 2001
From: Travis Nickles <nickles.travis@gmail.com>
Date: Sun, 28 Jul 2019 21:53:41 -0500
Subject: [PATCH 1/5] Seems to best fix issues with suspending. The delay is MS
 fault

Related to issue #730
---
 DS4Windows/DS4Forms/DS4Form.cs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs
index d76df50..4df11b7 100644
--- a/DS4Windows/DS4Forms/DS4Form.cs
+++ b/DS4Windows/DS4Forms/DS4Form.cs
@@ -652,6 +652,7 @@ namespace DS4Windows.Forms
                         DS4LightBar.shuttingdown = false;
                         wasrunning = false;
                         Program.rootHub.suspending = false;
+                        Thread.Sleep(8000);
                         this.Invoke((System.Action)(() => BtnStartStop_Clicked()));
                     }
 
@@ -663,13 +664,17 @@ namespace DS4Windows.Forms
                     {
                         DS4LightBar.shuttingdown = true;
                         Program.rootHub.suspending = true;
-                        this.Invoke((System.Action)(() => BtnStartStop_Clicked()));
-                        wasrunning = true;
+                        changingService = true;
 
-                        while (this.changingService)
-                        {
-                            Thread.SpinWait(500);
-                        }
+                        Program.rootHub.Stop(true);
+
+                        Invoke((System.Action)(() => {
+                            ServiceShutdownFinish();
+                            btnStartStop.Enabled = false;
+                        }));
+                        changingService = false;
+                        //this.Invoke((System.Action)(() => BtnStartStop_Clicked()));
+                        wasrunning = true;
                     }
 
                     break;

From 7e18f0d45c3dfd3aea1b0b0d12dacdd1f5e93ed9 Mon Sep 17 00:00:00 2001
From: Travis Nickles <nickles.travis@gmail.com>
Date: Mon, 29 Jul 2019 01:13:43 -0500
Subject: [PATCH 2/5] Minor tweak

---
 DS4Windows/DS4Forms/DS4Form.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs
index 4df11b7..0cccb58 100644
--- a/DS4Windows/DS4Forms/DS4Form.cs
+++ b/DS4Windows/DS4Forms/DS4Form.cs
@@ -673,7 +673,6 @@ namespace DS4Windows.Forms
                             btnStartStop.Enabled = false;
                         }));
                         changingService = false;
-                        //this.Invoke((System.Action)(() => BtnStartStop_Clicked()));
                         wasrunning = true;
                     }
 

From 6990821b1ab9bf416db9edad8b739c17bacc1948 Mon Sep 17 00:00:00 2001
From: Travis Nickles <nickles.travis@gmail.com>
Date: Mon, 29 Jul 2019 02:01:20 -0500
Subject: [PATCH 3/5] Updated newest file

---
 DS4Windows/newest.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DS4Windows/newest.txt b/DS4Windows/newest.txt
index e6a68e9..36c5cb9 100644
--- a/DS4Windows/newest.txt
+++ b/DS4Windows/newest.txt
@@ -1 +1 @@
-1.7.12
+1.7.13

From 628eedd5f1badba58feb3641183f63647e75f9a0 Mon Sep 17 00:00:00 2001
From: Travis Nickles <nickles.travis@gmail.com>
Date: Mon, 29 Jul 2019 02:01:33 -0500
Subject: [PATCH 4/5] Version 1.7.13

---
 DS4Windows/Properties/AssemblyInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DS4Windows/Properties/AssemblyInfo.cs b/DS4Windows/Properties/AssemblyInfo.cs
index 609191f..05aec77 100644
--- a/DS4Windows/Properties/AssemblyInfo.cs
+++ b/DS4Windows/Properties/AssemblyInfo.cs
@@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
 // 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.7.12")]
-[assembly: AssemblyFileVersion("1.7.12")]
+[assembly: AssemblyVersion("1.7.13")]
+[assembly: AssemblyFileVersion("1.7.13")]
 [assembly: NeutralResourcesLanguage("en")]
 

From aa0124970a09d3cd65403c3ae27f582d995f4c4a Mon Sep 17 00:00:00 2001
From: Travis Nickles <nickles.travis@gmail.com>
Date: Mon, 29 Jul 2019 02:37:53 -0500
Subject: [PATCH 5/5] No longer use quiet mode for ViGEm installer

---
 DS4Windows/DS4Forms/WelcomeDialog.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DS4Windows/DS4Forms/WelcomeDialog.cs b/DS4Windows/DS4Forms/WelcomeDialog.cs
index 6a8f50e..aa9bfff 100644
--- a/DS4Windows/DS4Forms/WelcomeDialog.cs
+++ b/DS4Windows/DS4Forms/WelcomeDialog.cs
@@ -73,7 +73,7 @@ namespace DS4Windows.Forms
             if (File.Exists(exepath + $"\\{InstFileName}"))
             {
                 bnStep1.Text = Properties.Resources.OpeningInstaller;
-                monitorProc = Process.Start(exepath + $"\\{InstFileName}", "/quiet");
+                monitorProc = Process.Start(exepath + $"\\{InstFileName}");
                 bnStep1.Text = Properties.Resources.Installing;
             }