mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: Rail waypoint selection window not closed 

When rail toolbar or rail waypoint build windows closed
pull/10872/head
Jonathan G Rennison 2023-05-25 23:15:15 +01:00 committed by rubidium42
parent 584faaf064
commit ba11467c02
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/rail_gui.cpp
View File

@ -423,6 +423,7 @@ struct BuildRailToolbarWindow : Window {
{ {
if (this->IsWidgetLowered(WID_RAT_BUILD_STATION)) SetViewportCatchmentStation(nullptr, true); if (this->IsWidgetLowered(WID_RAT_BUILD_STATION)) SetViewportCatchmentStation(nullptr, true);
if (_settings_client.gui.link_terraform_toolbar) CloseWindowById(WC_SCEN_LAND_GEN, 0, false); if (_settings_client.gui.link_terraform_toolbar) CloseWindowById(WC_SCEN_LAND_GEN, 0, false);
CloseWindowById(WC_SELECT_STATION, 0);
this->Window::Close(); this->Window::Close();
} }
@ -2022,6 +2023,12 @@ struct BuildRailWaypointWindow : PickerWindowBase {
this->BuildPickerList(); this->BuildPickerList();
} }
void Close() override
{
CloseWindowById(WC_SELECT_STATION, 0);
this->PickerWindowBase::Close();
}
bool FilterByText(const StationSpec *statspec) bool FilterByText(const StationSpec *statspec)
{ {
if (this->string_filter.IsEmpty()) return true; if (this->string_filter.IsEmpty()) return true;