miguel.horta/openttd-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag '1.11.0-RC1' into master

Browse Source
This commit is contained in:
Sergii Pylypenko
2021-03-15 21:01:22 +02:00
parent 033ba4a99f ad256b5c1d
commit 6ff256a3d1
170 changed files with 4755 additions and 2816 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/newgrf_gui.cpp
View File

@@ -662,7 +662,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
DeleteWindowByClass(WC_TEXTFILE);
DeleteWindowByClass(WC_SAVE_PRESET);
if (this->editable && !this->execute) {
if (this->editable && !this->execute && !_exit_game) {
CopyGRFConfigList(this->orig_list, this->actives, true);
ResetGRFConfig(false);
ReloadNewGRFData();
@@ -1130,7 +1130,7 @@ struct NewGRFWindow : public Window, NewGRFScanCallback {
case WID_NS_RESCAN_FILES:
case WID_NS_RESCAN_FILES2:
ScanNewGRFFiles(this);
RequestNewGRFScan(this);
break;
}
}