Merge remote-tracking branch 'origin/1.7'

Conflicts:
	src/libsync/syncjournaldb.cpp
	test/CMakeLists.txt

1 files changed, 15 insertions, 11 deletions

diff --git a/src/gui/openfilemanager.cpp b/src/gui/openfilemanager.cpp
index 397c5c56a..698cc3dd9 100644
--- a/src/gui/openfilemanager.cpp
+++ b/src/gui/openfilemanager.cpp
@@ -90,18 +90,22 @@ void showInFileManager(const QString &localPath)
         }
 #endif
         QString explorer = "explorer.exe "; // FIXME: we trust it's in PATH
+        QFileInfo fi(localPath);
 
-        if (!QFileInfo(localPath).isDir()) {
-            explorer += QLatin1String("/select,");
+        // canonicalFilePath returns empty if the file does not exist
+        if( !fi.canonicalFilePath().isEmpty() ) {
+            if (!fi.isDir()) {
+                explorer += QLatin1String("/select,");
+            }
+            explorer += QLatin1Char('"');
+            explorer += QDir::toNativeSeparators(fi.canonicalFilePath());
+            explorer += QLatin1Char('"');
+
+            qDebug() << "OO Open explorer commandline:" << explorer;
+            QProcess p;
+            p.start(explorer);
+            p.waitForFinished(5000);
         }
-        explorer += QLatin1Char('"');
-        explorer += QDir::toNativeSeparators(localPath);
-        explorer += QLatin1Char('"');
-
-        qDebug() << "OO Open explorer commandline:" << explorer;
-        QProcess p;
-        p.start(explorer);
-        p.waitForFinished(5000);
     } else if (Utility::isMac()) {
         QStringList scriptArgs;
         scriptArgs << QLatin1String("-e")
@@ -182,4 +186,4 @@ void showInFileManager(const QString &localPath)
     }
 }
 
-}
\ No newline at end of file
+}