Merge branch 'save_ext' into improved_breakdowns

2017-06-06 18:41:01 +01:00
parent 5ba666883b 843343fcf1
commit 44fa555c6d
211 changed files with 3067 additions and 2038 deletions
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1727,7 +1727,7 @@ static void HandleSettingDescs(IniFile *ini, SettingDescProc *proc, SettingDescP
 static IniFile *IniLoadConfig()
 {
 	IniFile *ini = new IniFile(_list_group_names);
-	ini->LoadFromDisk(_config_file, BASE_DIR);
+	ini->LoadFromDisk(_config_file, NO_DIRECTORY);
 	return ini;
 }