Fix Windows sidebar entry non vfs (#10481)

owncloud · Feb 8, 2023 · 0e8c8cc · 0e8c8cc
1 parent 4ecf8f5
commit 0e8c8cc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/changelog/unreleased/10481 b/changelog/unreleased/10481
@@ -0,0 +1,3 @@
+Bugfix: Fix generation of Windows sidebar entry when VFS is disabled
+
+https://github.com/owncloud/client/pull/10481
diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
@@ -1480,6 +1480,12 @@ bool Folder::groupInSidebar() const
     return false;
 }
 
+void Folder::setNavigationPaneClsid(const QUuid &clsid)
+{
+    _definition.navigationPaneClsid = clsid;
+    saveToSettings();
+}
+
 bool FolderDefinition::isDeployed() const
 {
     return _deployed;

diff --git a/src/gui/folder.h b/src/gui/folder.h
@@ -212,7 +212,7 @@ class Folder : public QObject
      */
     QString remotePathTrailingSlash() const;
 
-    void setNavigationPaneClsid(const QUuid &clsid) { _definition.navigationPaneClsid = clsid; }
+    void setNavigationPaneClsid(const QUuid &clsid);
     QUuid navigationPaneClsid() const { return _definition.navigationPaneClsid; }
 
     /**

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
@@ -914,9 +914,6 @@ Folder *FolderMan::addFolder(const AccountStatePtr &accountState, const FolderDe
         emit folderListChanged();
     }
 
-#ifdef Q_OS_WIN
-    _navigationPaneHelper.scheduleUpdateCloudStorageRegistry();
-#endif
     return folder;
 }
 
@@ -1399,10 +1396,11 @@ Folder *FolderMan::addFolderFromWizard(const AccountStatePtr &accountStatePtr, c
         if (!newFolder->groupInSidebar()) {
             Utility::setupFavLink(localFolder);
 #ifdef Q_OS_WIN
-            // TODO: move to setupFavLink
-            // TODO: don't call setupFavLinkt if showInExplorerNavigationPane is false?
-            if (_navigationPaneHelper.showInExplorerNavigationPane())
-                folderDefinition.navigationPaneClsid = QUuid::createUuid();
+            if (_navigationPaneHelper.showInExplorerNavigationPane()) {
+                newFolder->setNavigationPaneClsid(QUuid::createUuid());
+                // we might need to add or remove the panel entry as cfapi brings this feature out of the box
+                FolderMan::instance()->navigationPaneHelper().scheduleUpdateCloudStorageRegistry();
+            }
 #endif
         }
         if (!ConfigFile().newBigFolderSizeLimit().first) {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Bugfix: Fix generation of Windows sidebar entry when VFS is disabled

		https://github.com/owncloud/client/pull/10481