diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-01-27 08:53:40 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-01-27 08:53:40 (GMT) |
| commit | fdd5a4f3c18b47826ebe63d8753cd27164ad8169 (patch) | |
| tree | c78d347f4fe576288a95e8239bbca2da99f0626e /src/gui/kernel/qeventdispatcher_mac.mm | |
| parent | aebc34877fb17405e8e5915760012a82d0178b97 (diff) | |
| parent | 35386ae28887d56cf6fd6f6cc7ceaf0506abe18a (diff) | |
| download | Qt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.zip Qt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.tar.gz Qt-fdd5a4f3c18b47826ebe63d8753cd27164ad8169.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
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 |