From 7091121b2cbd1cfd0acea1517b3645ce506bb8a5 Mon Sep 17 00:00:00 2001 From: jules Date: Wed, 8 Jan 2014 10:31:09 +0000 Subject: [PATCH] Avoided some problems when modal components are left open during shutdown. --- .../components/juce_ModalComponentManager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp b/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp index e4d8e96611..44a4794541 100644 --- a/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp +++ b/modules/juce_gui_basics/components/juce_ModalComponentManager.cpp @@ -63,7 +63,9 @@ public: if (isActive) { isActive = false; - ModalComponentManager::getInstance()->triggerAsyncUpdate(); + + if (ModalComponentManager* mcm = ModalComponentManager::getInstanceWithoutCreating()) + mcm->triggerAsyncUpdate(); } } @@ -83,6 +85,7 @@ ModalComponentManager::ModalComponentManager() ModalComponentManager::~ModalComponentManager() { + stack.clear(); clearSingletonInstance(); }