Merge branch 'master' into save_ext

2017-03-28 02:26:13 +01:00
parent c4e06808a2 065a0547e2
commit f58fe00294
79 changed files with 468 additions and 168 deletions
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1693,7 +1693,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;
 }