From c991854658a042637ab5f17d22dba1112ff68ffb Mon Sep 17 00:00:00 2001
From: WrinklyNinja <wrinklyninja1@gmail.com>
Date: Fri, 21 Mar 2014 09:50:39 +0000
Subject: [PATCH] Fixed settings being initialised incorrectly.

If the settings file was missing.
---
 src/gui/main.cpp | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index a9a723d8..1b2d5632 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -204,20 +204,18 @@ bool LOOT::OnInit() {
             return false;
         }
         GenerateDefaultSettingsFile(g_path_settings.string());
-    } 
-    else {
-        try {
-            loot::ifstream in(g_path_settings);
-            _settings = YAML::Load(in);
-            in.close();
-        } catch (YAML::ParserException& e) {
-            wxMessageBox(
-				FromUTF8(format(loc::translate("Error: Settings parsing failed. %1%")) % e.what()),
-				translate("LOOT: Error"),
-				wxOK | wxICON_ERROR,
-				NULL);
-            return false;
-        }
+    }
+    try {
+        loot::ifstream in(g_path_settings);
+        _settings = YAML::Load(in);
+        in.close();
+    } catch (YAML::ParserException& e) {
+        wxMessageBox(
+			FromUTF8(format(loc::translate("Error: Settings parsing failed. %1%")) % e.what()),
+			translate("LOOT: Error"),
+			wxOK | wxICON_ERROR,
+			NULL);
+        return false;
     }
 
     //Set up logging.