From c8aad7b59ede3e1c1655059ee9db2436c627aae2 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Fri, 4 Mar 2011 17:02:32 +0200
Subject: 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
---
 src/corelib/io/qfilesystemwatcher_symbian.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/corelib/io/qfilesystemwatcher_symbian.cpp b/src/corelib/io/qfilesystemwatcher_symbian.cpp
index 29ec77a..8e8dfe5 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);
         }
     }
 }
-- 
cgit v0.12