From 319da1608d5ca0f15e642c8a81ca0942355fe4c9 Mon Sep 17 00:00:00 2001 From: reuk Date: Thu, 5 May 2022 21:35:49 +0100 Subject: [PATCH] PopupMenu: Avoid potential crash when accessing exitingModalState member --- modules/juce_gui_basics/menus/juce_PopupMenu.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp index 2a357bd4fbc7..54822d3bfb8c 100644 --- a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp +++ b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp @@ -509,10 +509,14 @@ struct MenuWindow : public Component auto resultID = options.hasWatchedComponentBeenDeleted() ? 0 : getResultItemID (item); exitModalState (resultID); - exitingModalState = true; - if (makeInvisible && deletionChecker != nullptr) - setVisible (false); + if (deletionChecker != nullptr) + { + exitingModalState = true; + + if (makeInvisible) + setVisible (false); + } if (resultID != 0 && item != nullptr