mirror of
https://github.com/cemu-project/DS4Windows.git
synced 2025-01-11 15:59:08 +01:00
Merge branch 'jay' into vigem-udpserver
This commit is contained in:
commit
d449f1df7f
@ -499,6 +499,10 @@ namespace DS4Windows
|
||||
};
|
||||
LogDebug("X360 Controller # " + (i + 1) + " connected");
|
||||
}
|
||||
else
|
||||
{
|
||||
useDInputOnly[i] = true;
|
||||
}
|
||||
|
||||
int tempIdx = i;
|
||||
device.Report += (sender, e) =>
|
||||
@ -742,6 +746,10 @@ namespace DS4Windows
|
||||
};
|
||||
LogDebug("X360 Controller # " + (Index + 1) + " connected");
|
||||
}
|
||||
else
|
||||
{
|
||||
useDInputOnly[Index] = true;
|
||||
}
|
||||
|
||||
TouchPadOn(Index, device);
|
||||
CheckProfileOptions(Index, device);
|
||||
|
@ -2557,7 +2557,6 @@ namespace DS4Windows
|
||||
{
|
||||
if (device < 4)
|
||||
{
|
||||
//bool changed = false;
|
||||
DS4Device tempDevice = control.DS4Controllers[device];
|
||||
bool exists = tempBool = (tempDevice != null);
|
||||
bool synced = tempBool = exists ? tempDevice.isSynced() : false;
|
||||
@ -2569,23 +2568,17 @@ namespace DS4Windows
|
||||
Global.useDInputOnly[device] = true;
|
||||
xinputPlug = false;
|
||||
xinputStatus = true;
|
||||
|
||||
//changed = true;
|
||||
}
|
||||
else if (synced && isAlive)
|
||||
{
|
||||
Global.useDInputOnly[device] = false;
|
||||
xinputPlug = true;
|
||||
xinputStatus = true;
|
||||
|
||||
//changed = true;
|
||||
}
|
||||
|
||||
/*if (changed)
|
||||
else if (!synced)
|
||||
{
|
||||
System.Threading.Thread.Sleep(Global.XINPUT_UNPLUG_SETTLE_TIME);
|
||||
Global.useDInputOnly[device] = true;
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user