From: James Botting <james@bottswanamedia.info>
Date: Sun, 24 Jan 2016 18:45:29 +0000 (+0000)
Subject: Alter sync engine to check new setting before displaying prompt
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1354^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d8af949a6a9738765afe66b748ddedd92e8afc9c;p=nextcloud-desktop.git

Alter sync engine to check new setting before displaying prompt
---

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index cf99c6365..4a7c73805 100644
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -23,6 +23,7 @@
 #include "syncfilestatus.h"
 #include "csync_private.h"
 #include "filesystem.h"
+#include "configfile.h"
 
 #ifdef Q_OS_WIN
 #include <windows.h>
@@ -824,7 +825,9 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
     emit transmissionProgress(*_progressInfo);
     _progressInfo->start();
 
-    if (!_hasNoneFiles && _hasRemoveFile) {
+    // Check the config file before displaying prompt in case it is disabled.
+    ConfigFile cfgFile;
+    if (!_hasNoneFiles && _hasRemoveFile && cfgFile.promptDeleteFiles()) {
         qDebug() << Q_FUNC_INFO << "All the files are going to be changed, asking the user";
         bool cancel = false;
         emit aboutToRemoveAllFiles(_syncedItems.first()->_direction, &cancel);