From: Olivier Goffart <ogoffart@woboq.com>
Date: Thu, 30 Aug 2018 16:14:33 +0000 (+0200)
Subject: Virtual files: don't check for new big folders
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~507
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=68ace415d40292ad6b967d288a18529d67e07671;p=nextcloud-desktop.git

Virtual files: don't check for new big folders

https://github.com/owncloud/client/issues/6724#issuecomment-417368475
---

diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
index d7aa729a9..0b8e8874d 100644
--- a/src/libsync/discoveryphase.cpp
+++ b/src/libsync/discoveryphase.cpp
@@ -76,7 +76,7 @@ bool DiscoveryPhase::isInSelectiveSyncBlackList(const QString &path) const
 
 bool DiscoveryPhase::checkSelectiveSyncNewFolder(const QString &path, RemotePermissions remotePerm)
 {
-    if (_syncOptions._confirmExternalStorage
+    if (_syncOptions._confirmExternalStorage && !_syncOptions._newFilesAreVirtual
         && remotePerm.hasPermission(RemotePermissions::IsMounted)) {
         // external storage.
 
@@ -99,7 +99,7 @@ bool DiscoveryPhase::checkSelectiveSyncNewFolder(const QString &path, RemotePerm
     }
 
     auto limit = _syncOptions._newBigFolderSizeLimit;
-    if (limit < 0) {
+    if (limit < 0 || _syncOptions._newFilesAreVirtual) {
         // no limit, everything is allowed;
         return false;
     }