From 31e454f284b1b1ee4d91d22048f17020b8f00f87 Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Wed, 27 Sep 2017 11:48:40 +0100
Subject: [PATCH] Avoided triggering an assertion when focus is returned by a
 popup menu to a hidden component

---
 modules/juce_gui_basics/menus/juce_PopupMenu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
index 530a49f7ee..6305d219e6 100644
--- a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
+++ b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
@@ -1621,7 +1621,7 @@ struct PopupMenuCompletionCallback  : public ModalComponentManager::Callback
             if (prevTopLevel != nullptr)
                 prevTopLevel->toFront (true);
 
-            if (prevFocused != nullptr)
+            if (prevFocused != nullptr && prevFocused->isShowing())
                 prevFocused->grabKeyboardFocus();
         }
     }