From 038ea82777c1453e08992386a7ae9ebe26feb498 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Thu, 5 Jan 2017 19:55:36 +0000
Subject: [PATCH] Fix #4996: Objects unloaded after loading landscape

---
 src/openrct2/editor.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/openrct2/editor.c b/src/openrct2/editor.c
index 04b136b623..ef9e05ea19 100644
--- a/src/openrct2/editor.c
+++ b/src/openrct2/editor.c
@@ -263,7 +263,9 @@ static void set_all_land_owned()
  */
 bool editor_load_landscape(const utf8 *path)
 {
-	window_close_construction_windows();
+	// #4996: Make sure the object selection window closes here to prevent unload objects
+	//        after we have loaded a new park.
+	window_close_all();
 
 	uint32 extension = get_file_extension_type(path);
 	switch (extension) {