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

# Conflicts: # DS4Windows/DS4Control/ScpUtil.cs
Jays2Kings · Sep 22, 2016 · 547bd7b · 547bd7b
2 parents 1bfc69e + 253363e
commit 547bd7b
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/DS4Windows/DS4Control/ScpUtil.cs b/DS4Windows/DS4Control/ScpUtil.cs
@@ -1396,8 +1396,16 @@ public Boolean LoadProfile(int device, bool launchprogram, ControlService contro
                 {
                     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]);