Browse Source

PopupMenu fix.

tags/2021-05-28
Julian Storer 15 years ago
parent
commit
83fb316e32
2 changed files with 6 additions and 2 deletions
  1. +3
    -1
      juce_amalgamated.cpp
  2. +3
    -1
      src/gui/components/menus/juce_PopupMenu.cpp

+ 3
- 1
juce_amalgamated.cpp View File

@@ -68132,9 +68132,11 @@ public:

void inputAttemptWhenModal()
{
Component::SafePointer<Component> deletionChecker (this);

timerCallback();

if (! isOverAnyMenu())
if (deletionChecker != 0 && ! isOverAnyMenu())
{
if (componentAttachedTo != 0)
{


+ 3
- 1
src/gui/components/menus/juce_PopupMenu.cpp View File

@@ -549,9 +549,11 @@ public:
void inputAttemptWhenModal()
{
Component::SafePointer<Component> deletionChecker (this);
timerCallback();
if (! isOverAnyMenu())
if (deletionChecker != 0 && ! isOverAnyMenu())
{
if (componentAttachedTo != 0)
{


Loading…
Cancel
Save