Harden shell interaction modal recovery

2026-04-07 12:00:44 +08:00
parent d3377708d2
commit 3def94d0e0
2 changed files with 213 additions and 1 deletions
--- a/new_editor/src/Core/UIEditorShellInteraction.cpp
+++ b/new_editor/src/Core/UIEditorShellInteraction.cpp
@@ -137,7 +137,10 @@ const std::vector<UIEditorResolvedMenuItem>* ResolvePopupItems(

    const UIEditorResolvedMenuItem* item =
        FindResolvedMenuItemRecursive(menu->items, popupState.itemId);
-    if (item == nullptr || item->kind != UIEditorMenuItemKind::Submenu) {
+    if (item == nullptr ||
+        item->kind != UIEditorMenuItemKind::Submenu ||
+        !item->enabled ||
+        item->children.empty()) {
        return nullptr;
    }