cpp/openttd-patchpack/source Changeset - r22605:e4c69307e71d

Changeset - r22605:e4c69307e71d

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

peter1138 - 7 years ago 2017-03-20 19:30:49
peter1138@openttd.org

(svn r27816) -Fix [FS#6421]: Do not search directories when opening ini files as we already have their full path.

3 files changed with 4 insertions and 4 deletions:

src/hotkeys.cpp

src/settings.cpp

src/window.cpp

0 comments (0 inline, 0 general)

src/hotkeys.cpp

➞

Show inline comments

@@ @@ -311,7 +311,7 @@ int HotkeyList::CheckMatch(uint16 keycod @@
 static void SaveLoadHotkeys(bool save)
+{
 	IniFile *ini = new IniFile();
-	ini->LoadFromDisk(_hotkeys_file, BASE_DIR);
+	ini->LoadFromDisk(_hotkeys_file, NO_DIRECTORY);
 	for (HotkeyList **list = _hotkey_lists->Begin(); list != _hotkey_lists->End(); ++list) {
 		if (save) {

src/settings.cpp

➞

Show inline comments

@@ @@ -1688,7 +1688,7 @@ static void HandleSettingDescs(IniFile * @@
 static IniFile *IniLoadConfig()
+{
 	IniFile *ini = new IniFile(_list_group_names);
-	ini->LoadFromDisk(_config_file, BASE_DIR);
+	ini->LoadFromDisk(_config_file, NO_DIRECTORY);
 	return ini;
+}

src/window.cpp

➞

Show inline comments

@@ @@ -139,7 +139,7 @@ int16 WindowDesc::GetDefaultHeight() con @@
 void WindowDesc::LoadFromConfig()
+{
 	IniFile *ini = new IniFile();
-	ini->LoadFromDisk(_windows_file, BASE_DIR);
+	ini->LoadFromDisk(_windows_file, NO_DIRECTORY);
 	for (WindowDesc **it = _window_descs->Begin(); it != _window_descs->End(); ++it) {
 		if ((*it)->ini_key == NULL) continue;
 		IniLoadWindowSettings(ini, (*it)->ini_key, *it);
@@ @@ -165,7 +165,7 @@ void WindowDesc::SaveToConfig() @@
 	QSortT(_window_descs->Begin(), _window_descs->Length(), DescSorter);
 	IniFile *ini = new IniFile();
-	ini->LoadFromDisk(_windows_file, BASE_DIR);
+	ini->LoadFromDisk(_windows_file, NO_DIRECTORY);
 	for (WindowDesc **it = _window_descs->Begin(); it != _window_descs->End(); ++it) {
 		if ((*it)->ini_key == NULL) continue;
 		IniSaveWindowSettings(ini, (*it)->ini_key, *it);

0 comments (0 inline, 0 general)