Add the folder UUID to the VfsSetupParamswork/rename-navigationPaneClsid

2 files changed, 6 insertions, 1 deletions

diff --git a/src/common/vfs.h b/src/common/vfs.h
index 7efde8ad7..f22ae92fa 100644
--- a/src/common/vfs.h
+++ b/src/common/vfs.h
@@ -16,6 +16,7 @@
 #include <QObject>
 #include <QScopedPointer>
 #include <QSharedPointer>
+#include <QUuid>
 #include <QVersionNumber>
 
 #include <memory>
@@ -39,6 +40,9 @@ class SyncFileItem;
 /** Collection of parameters for initializing a Vfs instance. */
 struct OCSYNC_EXPORT VfsSetupParams
 {
+    /// The UUID for the VFS location.
+    QUuid uuid;
+
     /** The full path to the folder on the local filesystem
      *
      * Always ends with /.
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index c97406edc..9708be831 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -537,7 +537,8 @@ void Folder::startVfs()
     }
 
     VfsSetupParams vfsParams;
-    vfsParams.filesystemPath = path();
+    vfsParams.uuid = uuid();
+    vfsParams.filesystemPath = path(); // This is ignored by the macOS VFS plug-in
     vfsParams.remotePath = remotePathTrailingSlash();
     vfsParams.account = _accountState->account();
     vfsParams.journal = &_journal;