mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r27816) -Fix [FS#6421]: Do not search directories when opening ini files as we already have their full path.
This commit is contained in:
parent
e8ea4748ed
commit
73ea8cdb21
|
@ -311,7 +311,7 @@ int HotkeyList::CheckMatch(uint16 keycode, bool global_only) const
|
||||||
static void SaveLoadHotkeys(bool save)
|
static void SaveLoadHotkeys(bool save)
|
||||||
{
|
{
|
||||||
IniFile *ini = new IniFile();
|
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) {
|
for (HotkeyList **list = _hotkey_lists->Begin(); list != _hotkey_lists->End(); ++list) {
|
||||||
if (save) {
|
if (save) {
|
||||||
|
|
|
@ -1688,7 +1688,7 @@ static void HandleSettingDescs(IniFile *ini, SettingDescProc *proc, SettingDescP
|
||||||
static IniFile *IniLoadConfig()
|
static IniFile *IniLoadConfig()
|
||||||
{
|
{
|
||||||
IniFile *ini = new IniFile(_list_group_names);
|
IniFile *ini = new IniFile(_list_group_names);
|
||||||
ini->LoadFromDisk(_config_file, BASE_DIR);
|
ini->LoadFromDisk(_config_file, NO_DIRECTORY);
|
||||||
return ini;
|
return ini;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -139,7 +139,7 @@ int16 WindowDesc::GetDefaultHeight() const
|
||||||
void WindowDesc::LoadFromConfig()
|
void WindowDesc::LoadFromConfig()
|
||||||
{
|
{
|
||||||
IniFile *ini = new IniFile();
|
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) {
|
for (WindowDesc **it = _window_descs->Begin(); it != _window_descs->End(); ++it) {
|
||||||
if ((*it)->ini_key == NULL) continue;
|
if ((*it)->ini_key == NULL) continue;
|
||||||
IniLoadWindowSettings(ini, (*it)->ini_key, *it);
|
IniLoadWindowSettings(ini, (*it)->ini_key, *it);
|
||||||
|
@ -165,7 +165,7 @@ void WindowDesc::SaveToConfig()
|
||||||
QSortT(_window_descs->Begin(), _window_descs->Length(), DescSorter);
|
QSortT(_window_descs->Begin(), _window_descs->Length(), DescSorter);
|
||||||
|
|
||||||
IniFile *ini = new IniFile();
|
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) {
|
for (WindowDesc **it = _window_descs->Begin(); it != _window_descs->End(); ++it) {
|
||||||
if ((*it)->ini_key == NULL) continue;
|
if ((*it)->ini_key == NULL) continue;
|
||||||
IniSaveWindowSettings(ini, (*it)->ini_key, *it);
|
IniSaveWindowSettings(ini, (*it)->ini_key, *it);
|
||||||
|
|
Loading…
Reference in New Issue