The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-01-25 22:41:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay-bezierCurveOutput

Browse Source
This commit is contained in:
mika-n 2019-07-29 11:31:30 +03:00
commit 229dfe5525
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -652,6 +652,7 @@ namespace DS4Windows.Forms
DS4LightBar.shuttingdown = false; DS4LightBar.shuttingdown = false;
wasrunning = false; wasrunning = false;
Program.rootHub.suspending = false; Program.rootHub.suspending = false;
Thread.Sleep(8000);
this.Invoke((System.Action)(() => BtnStartStop_Clicked())); this.Invoke((System.Action)(() => BtnStartStop_Clicked()));
} }
@ -663,13 +664,16 @@ namespace DS4Windows.Forms
{ {
DS4LightBar.shuttingdown = true; DS4LightBar.shuttingdown = true;
Program.rootHub.suspending = true; Program.rootHub.suspending = true;
this.Invoke((System.Action)(() => BtnStartStop_Clicked())); changingService = true;
wasrunning = true;
while (this.changingService) Program.rootHub.Stop(true);
{
Thread.SpinWait(500); Invoke((System.Action)(() => {
} ServiceShutdownFinish();
btnStartStop.Enabled = false;
}));
changingService = false;
wasrunning = true;
} }
break; break;

2
DS4Windows/DS4Forms/WelcomeDialog.cs
View File

@ -73,7 +73,7 @@ namespace DS4Windows.Forms
if (File.Exists(exepath + $"\\{InstFileName}")) if (File.Exists(exepath + $"\\{InstFileName}"))
{ {
bnStep1.Text = Properties.Resources.OpeningInstaller; bnStep1.Text = Properties.Resources.OpeningInstaller;
monitorProc = Process.Start(exepath + $"\\{InstFileName}", "/quiet"); monitorProc = Process.Start(exepath + $"\\{InstFileName}");
bnStep1.Text = Properties.Resources.Installing; bnStep1.Text = Properties.Resources.Installing;
} }

4
DS4Windows/Properties/AssemblyInfo.cs
View File

@ -33,7 +33,7 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.7.12")] [assembly: AssemblyVersion("1.7.13")]
[assembly: AssemblyFileVersion("1.7.12")] [assembly: AssemblyFileVersion("1.7.13")]
[assembly: NeutralResourcesLanguage("en")] [assembly: NeutralResourcesLanguage("en")]

2
DS4Windows/newest.txt
View File

@ -1 +1 @@
1.7.12 1.7.13