dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change window close/deallocation to match upstream

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-09-15 23:56:33 +01:00
parent 79cfc3e8bd
commit f5d1b1d8f8
50 changed files with 352 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tbtr_template_gui_create.cpp
View File

@@ -166,7 +166,7 @@ public:
UpdateButtonState();
}
~TemplateCreateWindow()
void Close() override
{
if (virtual_train != nullptr) {
DoCommandP(0, virtual_train->index, 0, CMD_DELETE_VIRTUAL_TRAIN);
@@ -177,6 +177,7 @@ public:
*create_window_open = false;
CloseWindowById(WC_BUILD_VIRTUAL_TRAIN, this->window_number);
InvalidateWindowClassesData(WC_TEMPLATEGUI_MAIN);
this->Window::Close();
}
void SetVirtualTrain(Train* const train)
@@ -208,7 +209,7 @@ public:
if (this->template_index != INVALID_VEHICLE) {
if (TemplateVehicle::GetIfValid(this->template_index) == nullptr) {
delete this;
this->Close();
return;
}
}
@@ -244,11 +245,11 @@ public:
} else if (this->template_index != INVALID_VEHICLE) {
DoCommandP(0, this->template_index, 0, CMD_DELETE_TEMPLATE_VEHICLE);
}
delete this;
this->Close();
break;
}
case TCW_CANCEL: {
delete this;
this->Close();
break;
}
case TCW_REFIT: {