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

Store force feedback delegate and unsubscribe before virtual controller disconnect

Browse Source 
Should not be necessary but do it as a pre-caution
This commit is contained in:
Travis Nickles 2020-03-29 17:20:24 -05:00
parent 5528c6956a
commit 1fd423b663
3 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DS4Windows/DS4Control/ControlService.cs
View File

@ -393,10 +393,12 @@ namespace DS4Windows
as Xbox360OutDevice; as Xbox360OutDevice;
//outputDevices[index] = tempXbox; //outputDevices[index] = tempXbox;
int devIndex = index; int devIndex = index;
tempXbox.cont.FeedbackReceived += (sender, args) => Nefarius.ViGEm.Client.Targets.Xbox360FeedbackReceivedEventHandler p = (sender, args) =>
{ {
SetDevRumble(device, args.LargeMotor, args.SmallMotor, devIndex); SetDevRumble(device, args.LargeMotor, args.SmallMotor, devIndex);
}; };
tempXbox.cont.FeedbackReceived += p;
tempXbox.forceFeedbackCall = p;
outputslotMan.DeferredPlugin(tempXbox, index, outputDevices); outputslotMan.DeferredPlugin(tempXbox, index, outputDevices);
//tempXbox.Connect(); //tempXbox.Connect();
@ -411,7 +413,7 @@ namespace DS4Windows
as DS4OutDevice; as DS4OutDevice;
//outputDevices[index] = tempDS4; //outputDevices[index] = tempDS4;
int devIndex = index; int devIndex = index;
tempDS4.cont.FeedbackReceived += (sender, args) => Nefarius.ViGEm.Client.Targets.DualShock4FeedbackReceivedEventHandler p = (sender, args) =>
{ {
//bool useRumble = false; bool useLight = false; //bool useRumble = false; bool useLight = false;
byte largeMotor = args.LargeMotor; byte largeMotor = args.LargeMotor;
@ -468,6 +470,8 @@ namespace DS4Windows
//Console.WriteLine(); //Console.WriteLine();
}; };
tempDS4.cont.FeedbackReceived += p;
tempDS4.forceFeedbackCall = p;
outputslotMan.DeferredPlugin(tempDS4, index, outputDevices); outputslotMan.DeferredPlugin(tempDS4, index, outputDevices);
//tempDS4.Connect(); //tempDS4.Connect();

14
DS4Windows/DS4Control/DS4OutDevice.cs
View File

@ -15,6 +15,7 @@ namespace DS4Windows
public DualShock4Controller cont; public DualShock4Controller cont;
private DualShock4Report report; private DualShock4Report report;
public DualShock4FeedbackReceivedEventHandler forceFeedbackCall;
public DS4OutDevice(ViGEmClient client) public DS4OutDevice(ViGEmClient client)
{ {
@ -141,7 +142,18 @@ namespace DS4Windows
} }
public override void Connect() => cont.Connect(); public override void Connect() => cont.Connect();
public override void Disconnect() => cont.Disconnect(); public override void Disconnect()
{
if (forceFeedbackCall != null)
{
cont.FeedbackReceived -= forceFeedbackCall;
forceFeedbackCall = null;
}
cont.Disconnect();
cont.Dispose();
cont = null;
}
public override string GetDeviceType() => devtype; public override string GetDeviceType() => devtype;
} }
} }

14
DS4Windows/DS4Control/Xbox360OutDevice.cs
View File

@ -18,6 +18,7 @@ namespace DS4Windows
public Xbox360Controller cont; public Xbox360Controller cont;
private Xbox360Report report; private Xbox360Report report;
public Xbox360FeedbackReceivedEventHandler forceFeedbackCall;
public Xbox360OutDevice(ViGEmClient client) public Xbox360OutDevice(ViGEmClient client)
{ {
@ -137,7 +138,18 @@ namespace DS4Windows
} }
public override void Connect() => cont.Connect(); public override void Connect() => cont.Connect();
public override void Disconnect() => cont.Disconnect(); public override void Disconnect()
{
if (forceFeedbackCall != null)
{
cont.FeedbackReceived -= forceFeedbackCall;
forceFeedbackCall = null;
}
cont.Disconnect();
cont.Dispose();
cont = null;
}
public override string GetDeviceType() => devType; public override string GetDeviceType() => devType;
} }
} }