From e7ce2b67331ae6d4a2dba1b186e29041a91127c4 Mon Sep 17 00:00:00 2001
From: WrinklyNinja <wrinklyninja1@gmail.com>
Date: Sat, 23 Aug 2014 17:44:26 +0100
Subject: [PATCH] Added more settings conversion stuff.

Closes #242.
---
 src/gui/app.cpp | 48 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/gui/app.cpp b/src/gui/app.cpp
index dcce513c..ed75b435 100644
--- a/src/gui/app.cpp
+++ b/src/gui/app.cpp
@@ -300,30 +300,33 @@ namespace loot {
             } else
                 return false;
         }
-        if (!_settings["game"])
+        if (!_settings["game"]) {
             if (_settings["Game"]) {
-            // Conversion from 0.6 key.
-            _settings["game"] = _settings["Game"];
-            _settings.remove("Game");
+                // Conversion from 0.6 key.
+                _settings["game"] = _settings["Game"];
+                _settings.remove("Game");
             }
             else
                 return false;
-        if (!_settings["lastGame"])
+        }
+        if (!_settings["lastGame"]) {
             if (_settings["Last Game"]) {
-            // Conversion from 0.6 key.
-            _settings["lastGame"] = _settings["Last Game"];
-            _settings.remove("Last Game");
+                // Conversion from 0.6 key.
+                _settings["lastGame"] = _settings["Last Game"];
+                _settings.remove("Last Game");
             }
             else
                 return false;
-        if (!_settings["debugVerbosity"])
+        }
+        if (!_settings["debugVerbosity"]) {
             if (_settings["Debug Verbosity"]) {
-            // Conversion from 0.6 key.
-            _settings["debugVerbosity"] = _settings["Debug Verbosity"];
-            _settings.remove("Debug Verbosity");
+                // Conversion from 0.6 key.
+                _settings["debugVerbosity"] = _settings["Debug Verbosity"];
+                _settings.remove("Debug Verbosity");
             }
             else
                 return false;
+        }
         if (!_settings["updateMasterlist"])
             if (_settings["Update Masterlist"]) {
             // Conversion from 0.6 key.
@@ -332,14 +335,27 @@ namespace loot {
             }
             else
                 return false;
-        if (!_settings["games"])
+        if (!_settings["games"]) {
             if (_settings["Games"]) {
-            // Conversion from 0.6 key.
-            _settings["games"] = _settings["Games"];
-            _settings.remove("Games");
+                // Conversion from 0.6 key.
+                _settings["games"] = _settings["Games"];
+
+                for (auto &node : _settings["games"]) {
+                    if (node["url"]) {
+                        node["repo"] = node["url"];
+                        node["branch"] = "master";
+                        node.remove("url");
+                    }
+                }
+
+                _settings.remove("Games");
             }
             else
                 return false;
+        }
+
+        if (_settings["windows"])
+            _settings.remove("windows");
 
         return true;
     }