Alter sync engine to check new setting before displaying prompt

This commit is contained in:
James Botting 2016-01-24 18:45:29 +00:00
parent 74a8c4aae8
commit d8af949a6a

View file

@ -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);