From 622add3dc9a668824737236232f6d62eab1c499e Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Thu, 7 Jan 2016 10:39:10 +0000
Subject: [PATCH] Made the PopupMenu keep a weak reference to its LookAndFeel,
 so that it'll avoid crashing in situations where the L+F is deleted while the
 menu is still on-screen.

---
 modules/juce_gui_basics/menus/juce_PopupMenu.cpp | 1 -
 modules/juce_gui_basics/menus/juce_PopupMenu.h   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
index 7954104885..74506adc3e 100644
--- a/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
+++ b/modules/juce_gui_basics/menus/juce_PopupMenu.cpp
@@ -1234,7 +1234,6 @@ private:
 
 //==============================================================================
 PopupMenu::PopupMenu()
-    : lookAndFeel (nullptr)
 {
 }
 
diff --git a/modules/juce_gui_basics/menus/juce_PopupMenu.h b/modules/juce_gui_basics/menus/juce_PopupMenu.h
index df66094938..a6e833bf3b 100644
--- a/modules/juce_gui_basics/menus/juce_PopupMenu.h
+++ b/modules/juce_gui_basics/menus/juce_PopupMenu.h
@@ -614,7 +614,7 @@ private:
     friend class MenuBarComponent;
 
     OwnedArray<Item> items;
-    LookAndFeel* lookAndFeel;
+    WeakReference<LookAndFeel> lookAndFeel;
 
     Component* createWindow (const Options&, ApplicationCommandManager**) const;
     int showWithOptionalCallback (const Options&, ModalComponentManager::Callback*, bool);