The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-30 04:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jay' into vigem-udpserver

Browse Source
This commit is contained in:
Travis Nickles 2018-10-15 03:06:39 -05:00
commit e5be19cb93
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DS4Windows/DS4Library/DS4Device.cs
View File

@ -1091,7 +1091,6 @@ namespace DS4Windows
error = string.Empty; error = string.Empty;
cState.CopyTo(pState); cState.CopyTo(pState);
}
lock (eventQueueLock) lock (eventQueueLock)
{ {
@ -1103,6 +1102,7 @@ namespace DS4Windows
} }
} }
} }
}
timeoutExecuted = true; timeoutExecuted = true;
} }

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.5.10")] [assembly: AssemblyVersion("1.5.11")]
[assembly: AssemblyFileVersion("1.5.10")] [assembly: AssemblyFileVersion("1.5.11")]
[assembly: NeutralResourcesLanguage("en")] [assembly: NeutralResourcesLanguage("en")]