From 0f223783dca992d15ce2f5bfd8c8b92899c7a1b6 Mon Sep 17 00:00:00 2001 From: Chong-U Lim Date: Wed, 20 Dec 2017 08:34:04 +0000 Subject: [PATCH] Fix editor crash on "save and exit" bug If a scene is modified and a user closes the editor and selects the "Save and exit" option in the modal dialog -- the editor crashes. This appears to be a result of the message queue being memdeleted AFTER visual servers have been destroyed. Remnant textures handled by the message queue throw a NRE when their own ~Texture destructors reference the visual servers. This fixes bugs: #12946 and #12813. --- main/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/main/main.cpp b/main/main.cpp index b53e9ef0f7c..5648676c4c2 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1871,6 +1871,7 @@ void Main::cleanup() { if (engine) memdelete(engine); + message_queue->flush(); memdelete(message_queue); unregister_core_driver_types();