The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-22 17:29:18 +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-30 15:00:19 +03:00
commit e85bfc5fde
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -645,6 +645,7 @@ namespace DS4Windows.Forms
short evType = Convert.ToInt16(e.NewEvent.GetPropertyValue("EventType"));
switch (evType)
{
// Wakeup from Suspend
case 7:
{
if (btnStartStop.Text == Properties.Resources.StartText && wasrunning)
@ -652,12 +653,27 @@ namespace DS4Windows.Forms
DS4LightBar.shuttingdown = false;
wasrunning = false;
Program.rootHub.suspending = false;
Thread.Sleep(8000);
this.Invoke((System.Action)(() => BtnStartStop_Clicked()));
Thread.Sleep(16000);
//this.Invoke((System.Action)(() => BtnStartStop_Clicked()));
changingService = true;
SynchronizationContext uiContext = null;
Invoke((System.Action)(() => {
uiContext = SynchronizationContext.Current;
btnStartStop.Enabled = false;
}));
Program.rootHub.Start(uiContext);
Invoke((System.Action)(() => {
ServiceStartupFinish();
}));
changingService = false;
}
break;
}
// Entering Suspend
case 4:
{
if (btnStartStop.Text == Properties.Resources.StopText)

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
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.7.13")]
[assembly: AssemblyFileVersion("1.7.13")]
[assembly: AssemblyVersion("1.7.14")]
[assembly: AssemblyFileVersion("1.7.14")]
[assembly: NeutralResourcesLanguage("en")]

2
DS4Windows/newest.txt
View File

@ -1 +1 @@
1.7.13
1.7.14