From f5f300ba820f8e6a268790e76d5cdb084853a099 Mon Sep 17 00:00:00 2001 From: Leonard Lee Date: Mon, 29 Sep 2014 15:07:09 +0200 Subject: [PATCH] Fix hangs on QFileSystemWatcher. QFileSystemWatcher hangs at a mutex or semaphore when adding network paths on OS X system. There is an else block that does not increment the 'it' iterator with ++it; inside the QFseventsFileSystemWatcherEngine::checkDir() call. Change-Id: I6c250c7f3d25399c3a0a58ce864e9466320b166b Reviewed-by: Jake Petroules --- src/corelib/io/qfilesystemwatcher_fsevents.mm | 1 + 1 file changed, 1 insertion(+) diff --git a/src/corelib/io/qfilesystemwatcher_fsevents.mm b/src/corelib/io/qfilesystemwatcher_fsevents.mm index e713769735..eebca1cfb0 100644 --- a/src/corelib/io/qfilesystemwatcher_fsevents.mm +++ b/src/corelib/io/qfilesystemwatcher_fsevents.mm @@ -149,6 +149,7 @@ bool QFseventsFileSystemWatcherEngine::checkDir(DirsByName::iterator &it) } if (dirChanged) emit emitDirectoryChanged(info.origPath, false); + ++it; } return needsRestart;