Merge branch 'jay' into vigem-udpserver

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

View File

@ -1091,15 +1091,15 @@ namespace DS4Windows
error = string.Empty;
cState.CopyTo(pState);
}
lock (eventQueueLock)
{
Action tempAct = null;
for (int actInd = 0, actLen = eventQueue.Count; actInd < actLen; actInd++)
lock (eventQueueLock)
{
tempAct = eventQueue.Dequeue();
tempAct.Invoke();
Action tempAct = null;
for (int actInd = 0, actLen = eventQueue.Count; actInd < actLen; actInd++)
{
tempAct = eventQueue.Dequeue();
tempAct.Invoke();
}
}
}
}

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