From a3f1a5b0a9babe6f471c5724b3f7b8825a90bd00 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Mon, 18 Dec 2023 22:45:15 +0100 Subject: [PATCH] fix: Crash when right clicking search bar when a provider with no menu options is open --- plugins/builtin/source/content/ui_items.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/builtin/source/content/ui_items.cpp b/plugins/builtin/source/content/ui_items.cpp index bb6cc22bf..0394186b9 100644 --- a/plugins/builtin/source/content/ui_items.cpp +++ b/plugins/builtin/source/content/ui_items.cpp @@ -182,10 +182,12 @@ namespace hex::plugin::builtin { }); EventFrameBegin::subscribe([] { - if (ImGui::BeginPopup("ProviderMenu") && rightClickedProvider != nullptr && !rightClickedProvider->getMenuEntries().empty()) { - drawProviderContextMenu(rightClickedProvider); - ImGui::EndPopup(); - } + if (ImGui::BeginPopup("ProviderMenu")) { + if (rightClickedProvider != nullptr && !rightClickedProvider->getMenuEntries().empty()) + drawProviderContextMenu(rightClickedProvider); + + ImGui::EndPopup(); + } }); ContentRegistry::Interface::addToolbarItem([] {