From fa17037f24ec8ced526effb8226f8c27da04cfbb Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 6 Feb 2016 06:52:22 +0100 Subject: Remove IN_MODIFY from inotify mask When copying a file to a watched directory, this leads to excessive inotify events. I'm guessing that's the source for the deadlock when encoding files on othalla. Anyway, it's worth a try. Also remove a stray qApp->processEvents() --- smdirwatcher.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'smdirwatcher.cpp') diff --git a/smdirwatcher.cpp b/smdirwatcher.cpp index 2bcaff3..cb9c6b7 100644 --- a/smdirwatcher.cpp +++ b/smdirwatcher.cpp @@ -52,7 +52,7 @@ void SmDirWatcher::setDir(const QString &dir){ * watching one directory at all time. * We don't care about the other events */ - mDescr = inotify_add_watch(mFd, qPrintable(dir), IN_CLOSE_WRITE | IN_CREATE | IN_DELETE | IN_MODIFY | IN_MOVED_FROM | IN_MOVED_TO); + mDescr = inotify_add_watch(mFd, qPrintable(dir), IN_CLOSE_WRITE | IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO); qApp->restoreOverrideCursor(); } @@ -153,8 +153,6 @@ void SmDirWatcher::run(){ emit newData(d, Added); }else if(mask & IN_DELETE || mask & IN_MOVED_FROM){ emit newData(d, Deleted); - }else if(mask & IN_MODIFY){ - emit newData(d, Modified); }else if(mask & IN_CLOSE_WRITE){ emit newData(d, CloseWrite); } -- cgit v1.2.3-70-g09d2