Change window close/deallocation to match upstream

2023-09-15 23:56:33 +01:00
parent 79cfc3e8bd
commit f5d1b1d8f8
50 changed files with 352 additions and 341 deletions
--- a/src/game/game_gui.cpp
+++ b/src/game/game_gui.cpp
@@ -111,10 +111,11 @@ struct GSConfigWindow : public Window {
 		this->RebuildVisibleSettings();
 	}

-	~GSConfigWindow()
+	void Close() override
 	{
 		HideDropDownMenu(this);
 		CloseWindowByClass(WC_SCRIPT_LIST);
+		this->Window::Close();
 	}

 	/**
@@ -354,7 +355,7 @@ struct GSConfigWindow : public Window {
 			}

 			case WID_GSC_ACCEPT:
-				delete this;
+				this->Close();
 				break;

 			case WID_GSC_RESET: