From: allexzander Date: Fri, 26 Mar 2021 19:41:44 +0000 (+0200) Subject: Temp fix for vfs failure. X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~296^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9d15334813ac3fd6ac40bf849b78e2a184308e29;p=nextcloud-desktop.git Temp fix for vfs failure. Signed-off-by: allexzander --- diff --git a/src/libsync/vfs/cfapi/cfapiwrapper.cpp b/src/libsync/vfs/cfapi/cfapiwrapper.cpp index dacc61c4b..07b5ddf1a 100644 --- a/src/libsync/vfs/cfapi/cfapiwrapper.cpp +++ b/src/libsync/vfs/cfapi/cfapiwrapper.cpp @@ -452,6 +452,12 @@ bool deleteSyncRootRegistryKey(const QString &syncRootPath, const QString &provi OCC::Result OCC::CfApiWrapper::registerSyncRoot(const QString &path, const QString &providerName, const QString &providerVersion, const QString &folderAlias, const QString &displayName, const QString &accountDisplayName) { + Q_UNUSED(displayName); + Q_UNUSED(folderAlias); + Q_UNUSED(providerName); + Q_UNUSED(accountDisplayName); + /* + * TODO: Figure out how to fix the WOW6432Node issue, then, uncomment this block // even if we fail to register our sync root with shell, we can still proceed with using the VFS const auto createRegistryKeyResult = createSyncRootRegistryKeys(providerName, folderAlias, displayName, accountDisplayName, path); Q_ASSERT(createRegistryKeyResult); @@ -459,6 +465,7 @@ OCC::Result OCC::CfApiWrapper::registerSyncRoot(const QString &pa if (!createRegistryKeyResult) { qCWarning(lcCfApiWrapper) << "Failed to create the registry key for path:" << path; } + */ const auto p = path.toStdWString(); const auto name = providerName.toStdWString(); @@ -491,12 +498,17 @@ OCC::Result OCC::CfApiWrapper::registerSyncRoot(const QString &pa OCC::Result OCC::CfApiWrapper::unregisterSyncRoot(const QString &path, const QString &providerName, const QString &accountDisplayName) { + Q_UNUSED(providerName); + Q_UNUSED(accountDisplayName); + /* + * TODO: Figure out how to fix the WOW6432Node issue, then, uncomment this block const auto deleteRegistryKeyResult = deleteSyncRootRegistryKey(path, providerName, accountDisplayName); Q_ASSERT(deleteRegistryKeyResult); if (!deleteRegistryKeyResult) { qCWarning(lcCfApiWrapper) << "Failed to delete the registry key for path:" << path; } + */ const auto p = path.toStdWString(); const qint64 result = CfUnregisterSyncRoot(p.data());