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

Merge remote-tracking branch 'origin/jay' into jay

Browse Source 
# Conflicts:
#	DS4Windows/DS4Control/ScpUtil.cs
This commit is contained in:
Jays2Kings 2016-09-21 22:40:27 -04:00
commit 547bd7b001
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DS4Windows/DS4Control/ScpUtil.cs
View File

@ -1396,8 +1396,16 @@ namespace DS4Windows
{ {
Item = m_Xdoc.SelectSingleNode("/" + rootname + "/Sensitivity"); Item = m_Xdoc.SelectSingleNode("/" + rootname + "/Sensitivity");
string[] s = Item.InnerText.Split('|'); string[] s = Item.InnerText.Split('|');
<<<<<<< HEAD
if (s.Length == 1) if (s.Length == 1)
s = Item.InnerText.Split(','); s = Item.InnerText.Split(',');
=======
if (s.Length != 6)
{
s = Item.InnerText.Split(',');
}
>>>>>>> origin/jay
double.TryParse(s[0], out LSSens[device]); double.TryParse(s[0], out LSSens[device]);
double.TryParse(s[1], out RSSens[device]); double.TryParse(s[1], out RSSens[device]);
double.TryParse(s[2], out l2Sens[device]); double.TryParse(s[2], out l2Sens[device]);