diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-03-04 17:02:32 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-03-04 17:23:41 +0200 |
commit | c8aad7b59ede3e1c1655059ee9db2436c627aae2 (patch) | |
tree | 6b2161daed14f640bd15030a2abc0e31902dcbc5 | |
parent | 25723504d1fc917671dbdeadf441c2ca12145297 (diff) | |
download | qt4-tools-c8aad7b59ede3e1c1655059ee9db2436c627aae2.tar.gz |
Don't leave from QNotifyChangeEvent::RunL() in QFileSystemWatcher
Unhandled leave can panic the active scheduler, so simply eat the
exception and output a warning, as not much else can be done.
Task-number: QT-4660
Reviewed-by: Janne Koskinen
-rw-r--r-- | src/corelib/io/qfilesystemwatcher_symbian.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp index 29ec77a67a..8e8dfe5f30 100644 --- a/src/corelib/io/qfilesystemwatcher_symbian.cpp +++ b/src/corelib/io/qfilesystemwatcher_symbian.cpp @@ -95,7 +95,10 @@ void QNotifyChangeEvent::RunL() SetActive(); if (!failureCount) { - QT_TRYCATCH_LEAVING(engine->emitPathChanged(this)); + int err; + QT_TRYCATCH_ERROR(err, engine->emitPathChanged(this)); + if (err != KErrNone) + qWarning("QNotifyChangeEvent::RunL() - emitPathChanged threw exception (Converted error code: %d)", err); } } } |