From 74c00af27c381fd56b5f81c7e52a3cba9a4030f4 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 19 Dec 2015 22:58:43 +0100 Subject: Allow closing an opening popup Change-Id: I4937808275c138fca09fa866b5df4d54d084357d Reviewed-by: J-P Nurmi --- src/templates/qquickpopup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/templates/qquickpopup.cpp b/src/templates/qquickpopup.cpp index 2da468d0..2e826591 100644 --- a/src/templates/qquickpopup.cpp +++ b/src/templates/qquickpopup.cpp @@ -92,7 +92,7 @@ QQuickPopupTransitionManager::QQuickPopupTransitionManager(QQuickPopupPrivate *p void QQuickPopupTransitionManager::transitionEnter() { - if (isRunning()) + if (state == Enter && isRunning()) return; QList actions; state = Enter; @@ -101,7 +101,7 @@ void QQuickPopupTransitionManager::transitionEnter() void QQuickPopupTransitionManager::transitionExit() { - if (isRunning()) + if (state == Exit && isRunning()) return; QList actions; state = Exit; -- cgit v1.2.3