From 3b434068eb31db19e6c3c672eb59a33343fcffa2 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 19 Apr 2020 19:37:23 +0200 Subject: [PATCH] WindowServer: Don't crash when encountering unsorted menu applets Fixes #1862. --- Servers/WindowServer/AppletManager.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Servers/WindowServer/AppletManager.cpp b/Servers/WindowServer/AppletManager.cpp index 16cdf4c9da..e07fd46220 100644 --- a/Servers/WindowServer/AppletManager.cpp +++ b/Servers/WindowServer/AppletManager.cpp @@ -79,9 +79,7 @@ void AppletManager::add_applet(Window& applet) quick_sort(m_applets, [](auto& a, auto& b) { auto index_a = order_vector.find_first_index(a->title()); auto index_b = order_vector.find_first_index(b->title()); - ASSERT(index_a.has_value()); - ASSERT(index_b.has_value()); - return index_a.value() > index_b.value(); + return index_a.value_or("") > index_b.value_or(""); }); calculate_applet_rects(MenuManager::the().window());