From 6f71bd9353fa2348758825c80aaab10c5a8e699d Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Wed, 25 Feb 2015 11:55:48 +0100 Subject: [PATCH] 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 6f577cea8..0560fa9b6 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); }