diff options
author | axis <qt-info@nokia.com> | 2009-10-19 08:27:18 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-10-19 08:35:49 (GMT) |
commit | 8472e256280f683f69fd5d9db5c2ed645dab6c92 (patch) | |
tree | 89a7cd4cd2ae1b26044aa146a41363fa6a0531a5 /src | |
parent | 10a437f02966ad0963b66585cc2ff6210b995f18 (diff) | |
download | Qt-8472e256280f683f69fd5d9db5c2ed645dab6c92.zip Qt-8472e256280f683f69fd5d9db5c2ed645dab6c92.tar.gz Qt-8472e256280f683f69fd5d9db5c2ed645dab6c92.tar.bz2 |
Made sure the noSocketEvents value is preserved in case of exception.
Task: QT-987
RevBy: mread
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/kernel/qeventdispatcher_symbian.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp index 02f77a1..b32696d 100644 --- a/src/corelib/kernel/qeventdispatcher_symbian.cpp +++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp @@ -668,6 +668,7 @@ void QEventDispatcherSymbian::closingDown() bool QEventDispatcherSymbian::processEvents ( QEventLoop::ProcessEventsFlags flags ) { bool handledAnyEvent = false; + bool oldNoSocketEventsValue = m_noSocketEvents; QT_TRY { Q_D(QAbstractEventDispatcher); @@ -686,7 +687,6 @@ bool QEventDispatcherSymbian::processEvents ( QEventLoop::ProcessEventsFlags fla block = false; } - bool oldNoSocketEventsValue = m_noSocketEvents; if (flags & QEventLoop::ExcludeSocketNotifiers) { m_noSocketEvents = true; } else { @@ -762,14 +762,14 @@ bool QEventDispatcherSymbian::processEvents ( QEventLoop::ProcessEventsFlags fla }; emit awake(); - - m_noSocketEvents = oldNoSocketEventsValue; } QT_CATCH (const std::exception& ex) { #ifndef QT_NO_EXCEPTIONS CActiveScheduler::Current()->Error(qt_symbian_exception2Error(ex)); #endif } + m_noSocketEvents = oldNoSocketEventsValue; + return handledAnyEvent; } |