diff --git a/DS4Windows/DS4Forms/DS4Form.cs b/DS4Windows/DS4Forms/DS4Form.cs index d76df50..0cccb58 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,16 @@ 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; + wasrunning = true; } break; 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; } 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")] 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