diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-02-03 00:05:16 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-02-03 00:05:16 (GMT) |
| commit | b437255afe8348d0e5b865bd28cbf0500b3750f7 (patch) | |
| tree | 76e31711c342d3176e5a26813937177bd4318b2d /src/gui/kernel/qeventdispatcher_mac.mm | |
| parent | 17d0ed5af4922645a268b6550742fb521d459c8e (diff) | |
| parent | 778e902e675a4fb2680012f9bf1221abd3b13981 (diff) | |
| download | Qt-b437255afe8348d0e5b865bd28cbf0500b3750f7.zip Qt-b437255afe8348d0e5b865bd28cbf0500b3750f7.tar.gz Qt-b437255afe8348d0e5b865bd28cbf0500b3750f7.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/kernel/qeventdispatcher_mac.mm')
| -rw-r--r-- | src/gui/kernel/qeventdispatcher_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm index eda75db..c7c7caf 100644 --- a/src/gui/kernel/qeventdispatcher_mac.mm +++ b/src/gui/kernel/qeventdispatcher_mac.mm @@ -569,7 +569,7 @@ bool QEventDispatcherMac::processEvents(QEventLoop::ProcessEventsFlags flags) // in cocoa. [NSApp run] should be called at least once for any cocoa app. if (NSModalSession session = d->currentModalSession()) { QBoolBlocker execGuard(d->currentExecIsNSAppRun, false); - while (!d->interrupt && [NSApp runModalSession:session] == NSRunContinuesResponse) + while ([NSApp runModalSession:session] == NSRunContinuesResponse && !d->interrupt) qt_mac_waitForMoreModalSessionEvents(); if (!d->interrupt && session == d->currentModalSessionCached) { // INVARIANT: Someone called e.g. [NSApp stopModal:] from outside the event |