Skip to content

Commit

Permalink
Merge pull request #4664 from ckamm/hiddenfiles
Browse files Browse the repository at this point in the history
Fix hidden file handling #4655
  • Loading branch information
Klaas Freitag committed Apr 12, 2016
2 parents fdcdddc + 6f454fe commit f443377
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 0 additions & 1 deletion csync/src/csync.c
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,6 @@ int csync_commit(CSYNC *ctx) {
ctx->remote.read_from_db = 0;
ctx->read_remote_from_db = true;
ctx->db_is_empty = false;
ctx->ignore_hidden_files = true; // do NOT sync hidden files by default.


/* Create new trees */
Expand Down
2 changes: 2 additions & 0 deletions src/gui/folder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -753,6 +753,8 @@ void Folder::startSync(const QStringList &pathList)
quint64 limit = newFolderLimit.first ? newFolderLimit.second * 1000 * 1000 : -1; // convert from MB to B
_engine->setNewBigFolderSizeLimit(limit);

_engine->setIgnoreHiddenFiles(_definition.ignoreHiddenFiles);

QMetaObject::invokeMethod(_engine.data(), "startSync", Qt::QueuedConnection);

// disable events until syncing is done
Expand Down
2 changes: 1 addition & 1 deletion src/gui/folderwatcher_linux.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ bool FolderWatcherPrivate::findFoldersBelow( const QDir& dir, QStringList& fullL
} else {
QStringList nameFilter;
nameFilter << QLatin1String("*");
QDir::Filters filter = QDir::Dirs | QDir::NoDotAndDotDot|QDir::NoSymLinks;
QDir::Filters filter = QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::Hidden;
const QStringList pathes = dir.entryList(nameFilter, filter);

QStringList::const_iterator constIterator;
Expand Down

0 comments on commit f443377

Please sign in to comment.