From 6cbef78738415b5cdbddf985351b5e048ce2dd79 Mon Sep 17 00:00:00 2001
From: Philip <155102424+Brockengespenst@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:32:55 +0100
Subject: [PATCH] Fix crash when removing tilemap in level editor (#3182)

As pop_menu() in MenuManager frees the ObjectMenu which actually invoked
the pop_men(), m_object and all other members are not valid anymore.
Therefore, pop_menu() needs to be the last thing to call in the
menu_action.

Fixes #3117
---
 src/editor/object_menu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/editor/object_menu.cpp b/src/editor/object_menu.cpp
index ad0708ffaf..6d24c84083 100644
--- a/src/editor/object_menu.cpp
+++ b/src/editor/object_menu.cpp
@@ -108,8 +108,8 @@ ObjectMenu::menu_action(MenuItem& item)
     case MNID_REMOVE:
       m_editor.delete_markers();
       m_editor.m_reactivate_request = true;
-      MenuManager::instance().pop_menu();
       m_object->remove_me();
+      MenuManager::instance().pop_menu();
       break;
 
     case MNID_REMOVEFUNCTION: