Merge branch 'vehicle_group_info' into jgrpp

2017-04-01 01:02:22 +01:00
parent 85c7c4b307 e4aacee627
commit 83091f55da
12 changed files with 163 additions and 105 deletions
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1769,7 +1769,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;
 }