summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong-U Lim <me@chongdahsu.com>2017-12-20 08:34:04 +0000
committerChong-U Lim <me@chongdahsu.com>2017-12-20 08:34:04 +0000
commit0f223783dca992d15ce2f5bfd8c8b92899c7a1b6 (patch)
treec759a8f533f32790e0fca36b1903aefcd6432385
parentb08735f20987a6188fd54c5e2dcd072dc316b413 (diff)
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.
-rw-r--r--main/main.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp
index b53e9ef0f7..5648676c4c 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();