From 46b08c244198e960e2560d3cb92094f3092dc5bb Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Tue, 30 Jun 2015 09:25:19 +0100 Subject: [PATCH] Fix GameSettings test failures. --- src/backend/game/game_settings.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/backend/game/game_settings.cpp b/src/backend/game/game_settings.cpp index 7919709f..ba0ec556 100644 --- a/src/backend/game/game_settings.cpp +++ b/src/backend/game/game_settings.cpp @@ -153,15 +153,24 @@ namespace loot { } fs::path GameSettings::DataPath() const { - return _gamePath / "Data"; + if (_gamePath.empty()) + return ""; + else + return _gamePath / "Data"; } fs::path GameSettings::MasterlistPath() const { - return g_path_local / _lootFolderName / "masterlist.yaml"; + if (_lootFolderName.empty()) + return ""; + else + return g_path_local / _lootFolderName / "masterlist.yaml"; } fs::path GameSettings::UserlistPath() const { - return g_path_local / _lootFolderName / "userlist.yaml"; + if (_lootFolderName.empty()) + return ""; + else + return g_path_local / _lootFolderName / "userlist.yaml"; } GameSettings& GameSettings::SetName(const std::string& name) {