fixed a merge request

This commit is contained in:
Jays2Kings 2016-09-21 22:42:25 -04:00
parent 547bd7b001
commit 5b87490644

View File

@ -1396,16 +1396,8 @@ 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]);