The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-12-23 23:21:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert back to old disconnect bluetooth behavior

Browse Source
This commit is contained in:
Travis Nickles 2017-04-26 18:39:33 -07:00
parent de1b6b223f
commit 44501c24de
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DS4Windows/DS4Control/Mapping.cs
View File

@ -1571,7 +1571,7 @@ namespace DS4Windows
ConnectionType deviceConn = d.getConnectionType();
if (deviceConn == ConnectionType.BT)
{
d.DisconnectBT(false);
d.DisconnectBT();
}
//foreach (DS4Controls dc in action.trigger)

23
DS4Windows/DS4Library/DS4Device.cs
View File

@ -726,7 +726,7 @@ namespace DS4Windows
{
if (conType == ConnectionType.BT)
{
if (DisconnectBT(false))
if (DisconnectBT())
return; // all done
}
else if (conType == ConnectionType.SONYWA)
@ -835,7 +835,7 @@ namespace DS4Windows
}
}
public bool DisconnectBT(bool allThreadsQuit = true)
public bool DisconnectBT()
{
if (Mac != null)
{
@ -850,6 +850,7 @@ namespace DS4Windows
//parse hex byte in reverse order
btAddr[5 - i] = Convert.ToByte(sbytes[i], 16);
}
long lbtAddr = BitConverter.ToInt64(btAddr, 0);
NativeMethods.BLUETOOTH_FIND_RADIO_PARAMS p = new NativeMethods.BLUETOOTH_FIND_RADIO_PARAMS();
@ -862,30 +863,27 @@ namespace DS4Windows
success = NativeMethods.DeviceIoControl(btHandle, IOCTL_BTH_DISCONNECT_DEVICE, ref lbtAddr, 8, IntPtr.Zero, 0, ref bytesReturned, IntPtr.Zero);
NativeMethods.CloseHandle(btHandle);
if (!success)
{
if (!NativeMethods.BluetoothFindNextRadio(searchHandle, ref btHandle))
btHandle = IntPtr.Zero;
}
}
NativeMethods.BluetoothFindRadioClose(searchHandle);
Console.WriteLine("Disconnect successful: " + success);
success = true; // XXX return value indicates failure, but it still works?
if(success)
if (success)
{
IsDisconnecting = true;
if (allThreadsQuit)
{
StopUpdate();
}
else
{
StopOutputUpdate();
}
StopOutputUpdate();
if (Removal != null)
Removal(this, EventArgs.Empty);
}
return success;
}
return false;
}
@ -902,6 +900,7 @@ namespace DS4Windows
{
isDisconnecting = true;
StopOutputUpdate();
if (Removal != null)
Removal(this, EventArgs.Empty);
}

2
DS4Windows/DS4Library/DS4Devices.cs
View File

@ -26,7 +26,7 @@ namespace DS4Windows
return deviceInstanceId;
}
//enumerates ds4 controllers in the system
// enumerates ds4 controllers in the system
public static void findControllers()
{
lock (Devices)