Fix again and again.
This commit is contained in:
parent
741b320733
commit
b040830ca6
|
@ -281,28 +281,6 @@ CSandMan::CSandMan(QWidget *parent)
|
||||||
connect(theAPI, SIGNAL(ConfigReloaded()), this, SLOT(OnIniReloaded()));
|
connect(theAPI, SIGNAL(ConfigReloaded()), this, SLOT(OnIniReloaded()));
|
||||||
|
|
||||||
connect(qApp, &QGuiApplication::commitDataRequest, this, &CSandMan::commitData);
|
connect(qApp, &QGuiApplication::commitDataRequest, this, &CSandMan::commitData);
|
||||||
if (theConf->GetBool("Options/CheckAutoDelete", false)) {
|
|
||||||
for (auto& box : theAPI->GetAllBoxes().toStdMap()) {
|
|
||||||
CSandBoxPtr pBox = box.second;
|
|
||||||
if (box.second->GetActiveProcessCount() == 0) {
|
|
||||||
if (!pBox->GetBool("NeverDelete", false))
|
|
||||||
{
|
|
||||||
if (pBox->GetBool("AutoDelete", false))
|
|
||||||
{
|
|
||||||
bool DeleteSnapshots = false;
|
|
||||||
// if this box auto deletes first show the recovry dialog with the option to abort deletion
|
|
||||||
//if (!theGUI->OpenRecovery(pBox, DeleteSnapshots, true)) // unless no files are found than continue silently
|
|
||||||
// return;
|
|
||||||
|
|
||||||
if (theConf->GetBool("Options/AutoBoxOpsNotify", false))
|
|
||||||
OnLogMessage(tr("Auto deleting content of %1").arg(pBox->GetName()), true);
|
|
||||||
|
|
||||||
DeleteBoxContent(pBox, eAuto, DeleteSnapshots);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*if (theConf->GetBool("Options/CheckAutoDelete", false)) {
|
/*if (theConf->GetBool("Options/CheckAutoDelete", false)) {
|
||||||
for (auto& box : theAPI->GetAllBoxes().toStdMap()) {
|
for (auto& box : theAPI->GetAllBoxes().toStdMap()) {
|
||||||
|
|
|
@ -1561,11 +1561,7 @@ void CSettingsWindow::SaveSettings()
|
||||||
theConf->SetValue("Options/EnableSuspendKey", ui.chkSuspend->isChecked());
|
theConf->SetValue("Options/EnableSuspendKey", ui.chkSuspend->isChecked());
|
||||||
theConf->SetValue("Options/SuspendKeySequence", ui.keySuspend->keySequence().toString());
|
theConf->SetValue("Options/SuspendKeySequence", ui.keySuspend->keySequence().toString());
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
theConf->SetValue("Options/CleanUpOnStart", !ui.chkCheckDelete->isChecked());
|
theConf->SetValue("Options/CleanUpOnStart", !ui.chkCheckDelete->isChecked());
|
||||||
=======
|
|
||||||
theConf->SetValue("Options/CheckAutoDelete", ui.chkCheckDelete->isChecked());
|
|
||||||
>>>>>>> cbb2b8660f0ba5f1e56841d78292bf64f7931de4
|
|
||||||
|
|
||||||
theConf->SetValue("Options/WatchBoxSize", ui.chkMonitorSize->isChecked());
|
theConf->SetValue("Options/WatchBoxSize", ui.chkMonitorSize->isChecked());
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue