[Pkg-owncloud-commits] [owncloud-client] 55/164: SocketAPI: Don't mark .lnk files as ignored on windows. #2447

[Sandro Knauß]

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 6f71bd9353fa2348758825c80aaab10c5a8e699d
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Wed Feb 25 11:55:48 2015 +0100

    SocketAPI: Don't mark .lnk files as ignored on windows. #2447
---
 src/gui/socketapi.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp
index 6f577ce..0560fa9 100644
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -536,7 +536,13 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
     }
 
     // file is ignored?
-    if( fi.isSymLink() ) {
+    // Qt considers .lnk files symlinks on Windows so we need to work
+    // around that here.
+    if( fi.isSymLink()
+#ifdef Q_OS_WIN
+            && fi.suffix() != "lnk"
+#endif
+            ) {
         return SyncFileStatus(SyncFileStatus::STATUS_IGNORE);
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git