From 1ca41da2aa30ea555721f9f45c3c7012250b5832 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 29 Aug 2018 13:46:56 +0200 Subject: [PATCH] Unload objects from context destructor. --- src/openrct2/Context.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 5941a28d8c..58393ac505 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -135,6 +135,13 @@ namespace OpenRCT2 ~Context() override { + // Requires this as otherwise it will try to access Instance from other destructors. + // after setting Instance to nullptr. + if (_objectManager) + { + _objectManager->UnloadAll(); + } + window_close_all(); gfx_object_check_all_images_freed(); gfx_unload_g2();