Fix save / load of controller mappings to optionsvrprofiles.txt

jrbudda · Feb 13, 2016 · e747db6 · e747db6
1 parent 6a63297
commit e747db6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/com/mtbs3d/minecrift/settings/profile/ProfileManager.java b/src/com/mtbs3d/minecrift/settings/profile/ProfileManager.java
@@ -214,7 +214,7 @@ private static synchronized boolean loadLegacySettings(File settingsFile, JSONOb
         Map<String, String> settings = new HashMap<String, String>();
         int count = 0;
         while ((s = br.readLine()) != null) {
-            String[] array = s.split(":");
+            String[] array = splitKeyValue(s);
             String setting = array[0];
             String value = "";
             if (array.length > 1) {
@@ -238,7 +238,7 @@ private static synchronized boolean loadLegacySettings(String settingStr, JSONOb
         Map<String, String> settings = new HashMap<String, String>();
         int count = 0;
         while ((s = br.readLine()) != null) {
-            String[] array = s.split(":");
+            String[] array = splitKeyValue(s);
             String setting = array[0];
             String value = "";
             if (array.length > 1) {
@@ -460,6 +460,11 @@ public static void loadControllerDefaults()
         }
     }
 
+    public static String[] splitKeyValue(String s) {
+        String[] array = s.split(":", 2);
+        return array;
+    }
+
     // Minecraft XBox controller defaults - TODO: Find a better place for this
     public static final String DEFAULT_BINDINGS =
             "key.playerlist:b:3:Button 3\n" +

diff --git a/src/com/mtbs3d/minecrift/settings/profile/ProfileWriter.java b/src/com/mtbs3d/minecrift/settings/profile/ProfileWriter.java
@@ -35,7 +35,7 @@ public ProfileWriter(String set, JSONObject theProfile)
 
     public void println(String s)
     {
-        String[] array = s.split(":");
+        String[] array = ProfileManager.splitKeyValue(s);
         String setting = array[0];
         String value = "";
         if (array.length > 1) {