From eb21a5992fa465504c3c91cce5c6e7aca21716c8 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Mon, 18 Dec 2023 22:51:08 +0100
Subject: [PATCH] impr: Make sure no empty popup appears when right clicking
 search box

---
 plugins/builtin/source/content/ui_items.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/builtin/source/content/ui_items.cpp b/plugins/builtin/source/content/ui_items.cpp
index 0394186b9..7bd7fa9e8 100644
--- a/plugins/builtin/source/content/ui_items.cpp
+++ b/plugins/builtin/source/content/ui_items.cpp
@@ -182,14 +182,18 @@ namespace hex::plugin::builtin {
         });
 
         EventFrameBegin::subscribe([] {
-            if (ImGui::BeginPopup("ProviderMenu")) {
-                if (rightClickedProvider != nullptr && !rightClickedProvider->getMenuEntries().empty())
+            if (rightClickedProvider != nullptr && !rightClickedProvider->getMenuEntries().empty()) {
+                if (ImGui::BeginPopup("ProviderMenu")) {
                     drawProviderContextMenu(rightClickedProvider);
-
-                ImGui::EndPopup();
+                    ImGui::EndPopup();
+                }
             }
         });
 
+        EventProviderChanged::subscribe([](auto, auto){
+            rightClickedProvider = nullptr;
+        });
+
         ContentRegistry::Interface::addToolbarItem([] {
             auto provider      = ImHexApi::Provider::get();
             bool providerValid = provider != nullptr;