summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qfilesystemwatcher_fsevents.mm
diff options
context:
space:
mode:
authorLeonard Lee <leonard.lee@digia.com>2014-09-29 15:07:09 +0200
committerLeonard Lee <leonard.lee@digia.com>2014-09-30 21:55:18 +0200
commitf5f300ba820f8e6a268790e76d5cdb084853a099 (patch)
treebf2332533473ee414c96336cd2f91401bcd40348 /src/corelib/io/qfilesystemwatcher_fsevents.mm
parent7696d20f75db6cb9834e790ba82449c85a975eb5 (diff)
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 <jake.petroules@petroules.com>
Diffstat (limited to 'src/corelib/io/qfilesystemwatcher_fsevents.mm')
-rw-r--r--src/corelib/io/qfilesystemwatcher_fsevents.mm1
1 files changed, 1 insertions, 0 deletions
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;