From 434380f26c8170529b2d15212ddf137a523b86fa Mon Sep 17 00:00:00 2001
From: WrinklyNinja <wrinklyninja1@gmail.com>
Date: Tue, 17 Sep 2013 13:25:37 +0100
Subject: [PATCH] Fixed a few possible crashes.

---
 src/gui/main.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 3855b135..68e24fd5 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -528,8 +528,12 @@ void Launcher::OnSortPlugins(wxCommandEvent& event) {
     if (fs::exists(_game.MasterlistPath()) || fs::exists(_game.UserlistPath())) {
         BOOST_LOG_TRIVIAL(trace) << "Merging plugin lists, evaluating conditions and checking for install validity...";
 
-         //Set language.
-        unsigned int lang = GetLangNum(_settings["Language"].as<string>());
+        //Set language.
+        unsigned int lang;
+        if (_settings["Language"])
+            lang = GetLangNum(_settings["Language"].as<string>());
+        else
+            lang = boss::g_lang_any;
 
 
         //Merge all global message lists.
@@ -778,7 +782,7 @@ void Launcher::OnSortPlugins(wxCommandEvent& event) {
                         plugins,
                         oldDetails,
                         revision,
-                        _settings["Update Masterlist"].as<bool>(),
+                        doUpdate,
                         _game.GraphPath().string());
     } catch (boss::error& e) {
         wxMessageBox(
@@ -893,7 +897,12 @@ void Launcher::OnEditMetadata(wxCommandEvent& event) {
 
     progDia->Pulse();
 
-    unsigned int lang = GetLangNum(_settings["Language"].as<string>());
+    //Set language.
+    unsigned int lang;
+    if (_settings["Language"])
+        lang = GetLangNum(_settings["Language"].as<string>());
+    else
+        lang = boss::g_lang_any;
 
     //Create editor window.
     BOOST_LOG_TRIVIAL(debug) << "Opening editor window.";