From 2b584300d6cc94dc1b1e54cda5700589fcafb9f2 Mon Sep 17 00:00:00 2001 From: scrawl Date: Mon, 7 May 2012 23:16:29 +0200 Subject: [PATCH 1/2] throw an exception when no default settings file is found, which indicates a packaging error --- apps/openmw/engine.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 319c42bbd..c1bbeb586 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -281,6 +281,8 @@ void OMW::Engine::go() settings.loadDefault(localdefault); else if (boost::filesystem::exists(globaldefault)) settings.loadDefault(globaldefault); + else + throw std::runtime_error ("No default settings file found! Make sure the file \"settings-default.cfg\" was properly installed."); // load user settings if they exist, otherwise just load the default settings as user settings const std::string settingspath = mCfgMgr.getUserPath().string() + "/settings.cfg"; From 37095b62c696674fc0122d541c4321eb1595a51e Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Thu, 10 May 2012 12:51:40 +0200 Subject: [PATCH 2/2] removed another include --- apps/openmw/mwgui/formatting.hpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/openmw/mwgui/formatting.hpp b/apps/openmw/mwgui/formatting.hpp index c8f2c9e44..a1e115491 100644 --- a/apps/openmw/mwgui/formatting.hpp +++ b/apps/openmw/mwgui/formatting.hpp @@ -3,8 +3,6 @@ #include -#include - namespace MWGui { struct TextStyle