From 3d01034a8fd46b94bd248014310a0f4998b5954c Mon Sep 17 00:00:00 2001 From: WrinklyNinja Date: Thu, 17 Jul 2014 09:41:03 +0100 Subject: [PATCH] Fixed use of code referencing temporary objects. --- src/gui/app.cpp | 3 --- src/gui/app.h | 1 - src/gui/handler.cpp | 4 ++-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/gui/app.cpp b/src/gui/app.cpp index c37df9fb..a5bf068f 100644 --- a/src/gui/app.cpp +++ b/src/gui/app.cpp @@ -253,7 +253,4 @@ namespace loot { const YAML::Node& LootState::GetSettings() const { return _settings; } - const YAML::Node& LootState::GetSetting(const std::string& setting) const { - return _settings[setting]; - } } \ No newline at end of file diff --git a/src/gui/app.h b/src/gui/app.h index 8bed8f4a..9f8e26c3 100644 --- a/src/gui/app.h +++ b/src/gui/app.h @@ -79,7 +79,6 @@ namespace loot { Game& CurrentGame(); const YAML::Node& GetSettings() const; - const YAML::Node& GetSetting(const std::string& setting) const; private: YAML::Node _settings; diff --git a/src/gui/handler.cpp b/src/gui/handler.cpp index 5bcd4882..55a55e20 100644 --- a/src/gui/handler.cpp +++ b/src/gui/handler.cpp @@ -204,8 +204,8 @@ namespace loot { //Set language. unsigned int language; - if (g_app_state.GetSetting("language")) - language = Language(g_app_state.GetSetting("language").as()).Code(); + if (g_app_state.GetSettings()["language"]) + language = Language(g_app_state.GetSettings()["language"].as()).Code(); else language = Language::any;