Merge pull request #15552 from CookiePLMonster/fix-15227

Fix Object Selection not tearing down objects properly

distribution/changelog.txt

@@ -26,6 +26,7 @@
 - Fix: [#15197] Cannot place flat ride after removing it in construction window.
 - Fix: [#15199] Construction window is not closed when a ride gets demolished.
 - Fix: [#15213] Freeze when hovering over Reverse Freefall Coaster in Russian.
+- Fix: [#15227] Crash on exit after hovering over water types in the Object Selection window.
 - Fix: [#15255] Tile Inspector shows banner information on walls that do not contain one.
 - Fix: [#15257] Chat icon shows in scenario/track editor. Other icons don't disable when deactivated in options menu.
 - Fix: [#15289] Unexpected behavior with duplicated banners which also caused desyncs in multiplayer.

src/openrct2-ui/windows/EditorObjectSelection.cpp

@@ -757,7 +757,10 @@ static void window_editor_object_selection_scroll_mouseover(
         w->selected_list_item = selectedObject;
 
         if (_loadedObject != nullptr)
+        {
             _loadedObject->Unload();
+            _loadedObject = nullptr;
+        }
 
         if (selectedObject == -1)
         {

src/openrct2/object/LargeSceneryObject.cpp

@@ -98,7 +98,7 @@ void LargeSceneryObject::Unload()
     gfx_object_free_images(_baseImageId, GetImageTable().GetCount());
 
     _legacyType.name = 0;
-    _legacyType.image = 0;
+    _baseImageId = _legacyType.image = 0;
 }
 
 void LargeSceneryObject::DrawPreview(rct_drawpixelinfo* dpi, int32_t width, int32_t height) const

src/openrct2/object/WaterObject.cpp

@@ -46,6 +46,7 @@ void WaterObject::Unload()
     language_free_object_string(_legacyType.string_idx);
 
     _legacyType.string_idx = 0;
+    _legacyType.image_id = 0;
 }
 
 void WaterObject::DrawPreview(rct_drawpixelinfo* dpi, int32_t width, int32_t height) const