瀏覽代碼

WindowServer: Don't crash when pressing return after opening menu

There isn't always a hovered item, so let's not assume things.
Andreas Kling 4 年之前
父節點
當前提交
17e25890be
共有 1 個文件被更改,包括 1 次插入2 次删除
  1. 1 2
      Services/WindowServer/MenuManager.cpp

+ 1 - 2
Services/WindowServer/MenuManager.cpp

@@ -181,8 +181,7 @@ void MenuManager::event(Core::Event& event)
 
 
             if (key_event.key() == Key_Return) {
             if (key_event.key() == Key_Return) {
                 auto hovered_item = m_current_menu->hovered_item();
                 auto hovered_item = m_current_menu->hovered_item();
-
-                if (!hovered_item->is_enabled())
+                if (!hovered_item || !hovered_item->is_enabled())
                     return;
                     return;
                 if (hovered_item->is_submenu())
                 if (hovered_item->is_submenu())
                     m_current_menu->descend_into_submenu_at_hovered_item();
                     m_current_menu->descend_into_submenu_at_hovered_item();