Merge branch 'jay' into vigem-udpserver

This commit is contained in:
Travis Nickles 2018-11-01 16:28:56 -05:00
commit 99a1342a51
3 changed files with 4 additions and 5 deletions

View File

@ -1102,7 +1102,6 @@ namespace DS4Windows
// Use Task to reset device synth state and commit it // Use Task to reset device synth state and commit it
Task.Run(() => Task.Run(() =>
{ {
Mapping.deviceState[ind].SavePrevious(true);
Mapping.Commit(ind); Mapping.Commit(ind);
}).Wait(); }).Wait();

View File

@ -32,7 +32,7 @@ namespace DS4Windows
} }
public Dictionary<UInt16, KeyPresses> keyPresses = new Dictionary<UInt16, KeyPresses>(); public Dictionary<UInt16, KeyPresses> keyPresses = new Dictionary<UInt16, KeyPresses>();
public void SavePrevious(bool performClear) public void SaveToPrevious(bool performClear)
{ {
previousClicks = currentClicks; previousClicks = currentClicks;
if (performClear) if (performClear)
@ -367,9 +367,9 @@ namespace DS4Windows
} }
} }
} }
globalState.SavePrevious(false); globalState.SaveToPrevious(false);
} }
state.SavePrevious(true); state.SaveToPrevious(true);
} }
public enum Click { None, Left, Middle, Right, Fourth, Fifth, WUP, WDOWN }; public enum Click { None, Left, Middle, Right, Fourth, Fifth, WUP, WDOWN };

View File

@ -2178,7 +2178,7 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
} }
else else
{ {
ScpDevice.UnregisterNotify(Handle); ScpDevice.UnregisterNotify(regHandle);
} }
} }
else if (userClosing && closeMini && !contextclose) else if (userClosing && closeMini && !contextclose)