summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Burchell <robin.burchell@collabora.com>2012-01-20 13:15:13 +0200
committerQt by Nokia <qt-info@nokia.com>2012-01-21 05:07:06 +0100
commit3b42024fcc49ad0603bc3a601ebe32b015d6a381 (patch)
tree0b550fb689b1e6bc5b3bd4a4da5a407897a005f9
parent3a3356a85079d734dfa57205a00e1996afc033df (diff)
Fix incorrect check for error when monitoring a path using inotify.
Per the manpage, inotify_add_watch will return -1 in the case of error, 0 is a valid watch descriptor. Task-number: QTBUG-12564 Change-Id: I56a54de2f5cf18b40aaeddc6de51d18dacbf8daf Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
-rw-r--r--src/corelib/io/qfilesystemwatcher_inotify.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp
index ff732bc70e..ce0b8da058 100644
--- a/src/corelib/io/qfilesystemwatcher_inotify.cpp
+++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp
@@ -277,7 +277,7 @@ QStringList QInotifyFileSystemWatcherEngine::addPaths(const QStringList &paths,
| IN_MOVE_SELF
| IN_DELETE_SELF
)));
- if (wd <= 0) {
+ if (wd < 0) {
perror("QInotifyFileSystemWatcherEngine::addPaths: inotify_add_watch failed");
continue;
}