From: David Edmundson Date: Tue, 4 Sep 2018 12:21:00 +0000 (+0200) Subject: Merge branch 'Applications/18.08' X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/f3c92120aade86b28fb78cb65b79611909312bdc?hp=cc3eb7d757c3016849217c4a3ccd0a9e52f70872 Merge branch 'Applications/18.08' --- diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp index d96dfe0b2..b881b7a52 100644 --- a/src/settings/general/confirmationssettingspage.cpp +++ b/src/settings/general/confirmationssettingspage.cpp @@ -92,13 +92,14 @@ void ConfirmationsSettingsPage::applySettings() confirmationGroup.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked()); confirmationGroup.writeEntry("ConfirmEmptyTrash", m_confirmEmptyTrash->isChecked()); confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked()); - confirmationGroup.sync(); + KConfigGroup scriptExecutionGroup(kioConfig, "Executable scripts"); if (m_confirmScriptExecution->isChecked()) { - KConfigGroup scriptExecutionGroup(kioConfig, "Executable scripts"); scriptExecutionGroup.writeEntry("behaviourOnLaunch", "alwaysAsk"); - scriptExecutionGroup.sync(); + } else { + scriptExecutionGroup.writeEntry("behaviourOnLaunch", "dontAsk"); } + kioConfig->sync(); GeneralSettings* settings = GeneralSettings::self(); settings->setConfirmClosingMultipleTabs(m_confirmClosingMultipleTabs->isChecked());