Commit 57b269e2 authored by Ananta Palani's avatar Ananta Palani
Browse files

Fix thumbnails not shown in Windows and excessive use of virtual memory /...

Fix thumbnails not shown in Windows and excessive use of virtual memory / handles which may cause crashes and other unexpected behavior by removing file monitoring and only monitoring directories for changes. These problems might still occur with very large numbers of folders but could not be confirmed. However, medium to large collections should no longer cause a problem.

BUG: 290962
CCBUG: 297793
CCBUG: 308310
CCBUG: 310252
CCBUG: 310865
CCBUG: 312422
CCBUG: 312999
CCBUG: 291917
CCBUG: 295445
CCBUG: 297686
FIXED-IN: 3.0.0
parent 63c73a30
......@@ -270,8 +270,15 @@ void AlbumWatch::slotAlbumAdded(Album* a)
d->dirWatchAddedDirs << dir;
// On OS X, file watch is broken in the OS and thus in Qt.
// Fixing is beyond our scope. See bug #289330.
// Disable file watch for OS X and hope for future improvements
#ifdef Q_WS_MAC
// On Windows, file watch is broken for large numbers of files
// and prevents any thumbnails from being shown (probably due to
// the thread manager that is used by QFileSystemWatcher that
// KDirWatch uses). Fixing is beyond our scope. See bugs #290962,
// #297793, #308310, #310252, #310865, #312422, and #312999.
// Disable file watch for OS X and Windows and hope for future
// improvement (possibly with the improvements planned for
// QFileSystemWatcher in Qt 5.1)
#if defined(Q_WS_MAC) || defined(Q_WS_WIN)
d->dirWatch->addDir(dir, KDirWatch::WatchDirOnly);
#else
d->dirWatch->addDir(dir, KDirWatch::WatchFiles | KDirWatch::WatchDirOnly);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment