From 7f3c3f6eb6a9a4bd289be7da4004d03d92c85ba6 Mon Sep 17 00:00:00 2001 From: Camila San Date: Fri, 12 Apr 2019 12:11:43 +0200 Subject: [PATCH] Uses configuraion to determine if it should show empty folder popup. Configuration default value is set to false because users are getting the popup message too often. Signed-off-by: Camila San --- src/libsync/configfile.cpp | 2 +- src/libsync/syncengine.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index 5fb2ef10f..a2881d4a8 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -750,7 +750,7 @@ void ConfigFile::setMoveToTrash(bool isChecked) bool ConfigFile::promptDeleteFiles() const { QSettings settings(configFile(), QSettings::IniFormat); - return settings.value(QLatin1String(promptDeleteC), true).toBool(); + return settings.value(QLatin1String(promptDeleteC), false).toBool(); } void ConfigFile::setPromptDeleteFiles(bool promptDeleteFiles) diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index a8077ed03..d9c240a93 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -26,6 +26,8 @@ #include "propagateremotedelete.h" #include "propagatedownload.h" #include "common/asserts.h" +#include "configfile.h" + #ifdef Q_OS_WIN #include @@ -1035,7 +1037,8 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult) } } - if (!_hasNoneFiles && _hasRemoveFile) { + ConfigFile cfgFile; + if (!_hasNoneFiles && _hasRemoveFile && cfgFile.promptDeleteFiles()) { qCInfo(lcEngine) << "All the files are going to be changed, asking the user"; bool cancel = false; emit aboutToRemoveAllFiles(syncItems.first()->_direction, &cancel); -- 2.30.2