Skip to content

Commit

Permalink
Version 1.4.0.81
Browse files Browse the repository at this point in the history
Fix crash when disconnecting by PS+Options
  • Loading branch information
Jays2Kings committed Oct 31, 2014
1 parent 30e1188 commit c8632a9
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions DS4Control/Control.cs
Original file line number Diff line number Diff line change
Expand Up @@ -484,15 +484,15 @@ protected virtual void CheckForHotkeys(int deviceID, DS4State cState, DS4State p
{
if (!d.Charging)
{
d.DisconnectBT();
InputMethods.performKeyRelease(Global.getCustomKey(0, DS4Controls.PS));
d.DisconnectBT(); InputMethods.performKeyRelease(Global.getCustomKey(0, DS4Controls.PS));
string[] skeys = Global.getCustomMacro(0, DS4Controls.PS).Split('/');
ushort[] keys = new ushort[skeys.Length];
for (int i = 0; i < keys.Length; i++)
{
keys[i] = ushort.Parse(skeys[i]);
InputMethods.performKeyRelease(keys[i]);
}
d = null;
}
}
if (cState.Touch1 && pState.PS)
Expand Down
8 changes: 4 additions & 4 deletions DS4Control/Mapping.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1397,10 +1397,10 @@ public static bool getBoolMapping(DS4Controls control, DS4State cState, DS4State
case DS4Controls.Square: return cState.Square;
case DS4Controls.Triangle: return cState.Triangle;
case DS4Controls.Circle: return cState.Circle;
case DS4Controls.TouchLeft: return tp.leftDown;
case DS4Controls.TouchRight: return tp.rightDown;
case DS4Controls.TouchMulti: return tp.multiDown;
case DS4Controls.TouchUpper: return tp.upperDown;
case DS4Controls.TouchLeft: return (tp != null ? tp.leftDown : false);
case DS4Controls.TouchRight: return (tp != null ? tp.rightDown : false);
case DS4Controls.TouchMulti: return (tp != null ? tp.multiDown : false);
case DS4Controls.TouchUpper: return (tp != null ? tp.upperDown : false);
case DS4Controls.LXNeg: return cState.LX < 127 - 55;
case DS4Controls.LYNeg: return cState.LY < 127 - 55;
case DS4Controls.RXNeg: return cState.RX < 127 - 55;
Expand Down
2 changes: 1 addition & 1 deletion DS4Control/ScpUtil.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1376,7 +1376,7 @@ public Boolean LoadProfile(int device, System.Windows.Forms.Control[] buttons, S
if (device < 4)
{
if (dinputOnly[device] == true) control.x360Bus.Unplug(device);
else if (control.DS4Controllers[device].IsAlive()) control.x360Bus.Plugin(device);
else if (control.DS4Controllers[device] != null && control.DS4Controllers[device].IsAlive()) control.x360Bus.Plugin(device);
}
}
catch { missingSetting = true; }
Expand Down
4 changes: 2 additions & 2 deletions DS4Tool/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// 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.4.0.8")]
[assembly: AssemblyFileVersion("1.4.0.8")]
[assembly: AssemblyVersion("1.4.0.81")]
[assembly: AssemblyFileVersion("1.4.0.81")]

0 comments on commit c8632a9

Please sign in to comment.