[Pkg-owncloud-commits] [owncloud-client] 52/69: FolderWatcher: Check for hidden outside of loop
Sandro Knauß
hefee-guest at moszumanska.debian.org
Fri Nov 7 19:41:11 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 6eec8962820ead4fd46f4ae8192d47cd8a813309
Author: Klaas Freitag <freitag at owncloud.com>
Date: Wed Nov 5 16:48:27 2014 +0100
FolderWatcher: Check for hidden outside of loop
---
src/mirall/folderwatcher.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/mirall/folderwatcher.cpp b/src/mirall/folderwatcher.cpp
index 303534c..7ff9153 100644
--- a/src/mirall/folderwatcher.cpp
+++ b/src/mirall/folderwatcher.cpp
@@ -71,6 +71,12 @@ bool FolderWatcher::pathIsIgnored( const QString& path )
{
if( path.isEmpty() ) return true;
+ QFileInfo fInfo(path);
+ if( fInfo.isHidden() ) {
+ qDebug() << "* Discarded as is hidden!" << fInfo.filePath();
+ return true;
+ }
+
// Remember: here only directories are checked!
// If that changes to files too at some day, remember to check
// for the database name as well as the trailing slash rule for
@@ -79,12 +85,6 @@ bool FolderWatcher::pathIsIgnored( const QString& path )
QRegExp regexp(pattern);
regexp.setPatternSyntax(QRegExp::Wildcard);
- QFileInfo fInfo(path);
- if( fInfo.isHidden() ) {
- qDebug() << "* Discarded as is hidden!" << fInfo.filePath();
- return true;
- }
-
if(pattern.endsWith('/')) {
// directory only pattern. But since only dirs here, we cut off the trailing dir.
pattern.remove(pattern.length()-1, 1); // remove the last char.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list