mirror of
https://github.com/cemu-project/DS4Windows.git
synced 2024-11-26 11:04:21 +01:00
Merge remote-tracking branch 'origin/jay' into jay
# Conflicts: # DS4Windows/DS4Control/ScpUtil.cs
This commit is contained in:
commit
547bd7b001
@ -1396,8 +1396,16 @@ namespace DS4Windows
|
||||
{
|
||||
Item = m_Xdoc.SelectSingleNode("/" + rootname + "/Sensitivity");
|
||||
string[] s = Item.InnerText.Split('|');
|
||||
<<<<<<< HEAD
|
||||
if (s.Length == 1)
|
||||
s = Item.InnerText.Split(',');
|
||||
=======
|
||||
if (s.Length != 6)
|
||||
{
|
||||
s = Item.InnerText.Split(',');
|
||||
}
|
||||
|
||||
>>>>>>> origin/jay
|
||||
double.TryParse(s[0], out LSSens[device]);
|
||||
double.TryParse(s[1], out RSSens[device]);
|
||||
double.TryParse(s[2], out l2Sens[device]);
|
||||
|
Loading…
Reference in New Issue
Block a user