diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2012-02-06 13:14:11 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-08 08:20:27 (GMT) |
| commit | ff2de5928b1031d6946807f1e119b0765bc755c8 (patch) | |
| tree | ce1ee348d5c94712f09a23aef15beb26e202eb51 /src/gui | |
| parent | 03e133e8a8709b8ef737e587c9fb10b6fac9857c (diff) | |
| download | Qt-ff2de5928b1031d6946807f1e119b0765bc755c8.zip Qt-ff2de5928b1031d6946807f1e119b0765bc755c8.tar.gz Qt-ff2de5928b1031d6946807f1e119b0765bc755c8.tar.bz2 | |
Don't get stuck in a loop while trying to close the active popup widget
When the application is deactivated then it will try to close down the
active popup widget. However, the popup widget can prevent a close from
occuring and Qt should respect this without causing problems when the
application is reactivated later on.
Task-number: QTBUG-23448
Change-Id: Icc4902cbeac99eb631e569167227d9bcd4d4dcbb
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qapplication_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm index 3205578..8bd876a 100644 --- a/src/gui/kernel/qapplication_mac.mm +++ b/src/gui/kernel/qapplication_mac.mm @@ -3116,7 +3116,7 @@ void onApplicationChangedActivation( bool activated ) qt_mac_update_cursor(); } else { // de-activated QApplicationPrivate *priv = [[QT_MANGLE_NAMESPACE(QCocoaApplicationDelegate) sharedDelegate] qAppPrivate]; - while (priv->inPopupMode()) + if (priv->inPopupMode()) app->activePopupWidget()->close(); if (app) { QEvent ev(QEvent::ApplicationDeactivate); |