From 2e4f1a21b4bb6f38791f708a6d2f3e82b069599a Mon Sep 17 00:00:00 2001
From: Jonathan White <support@dmapps.us>
Date: Wed, 27 Sep 2017 18:28:42 -0400
Subject: [PATCH] Clear LastDatabases and LastKeyFiles when they are disabled
 in settings

---
 src/gui/SettingsWidget.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/gui/SettingsWidget.cpp b/src/gui/SettingsWidget.cpp
index af9a77930..e396f6043 100644
--- a/src/gui/SettingsWidget.cpp
+++ b/src/gui/SettingsWidget.cpp
@@ -225,6 +225,15 @@ void SettingsWidget::saveSettings()
     config()->set("security/passwordscleartext", m_secUi->passwordCleartextCheckBox->isChecked());
     config()->set("security/passwordsrepeat", m_secUi->passwordRepeatCheckBox->isChecked());
 
+    // Security: clear storage if related settings are disabled
+    if (!config()->get("RememberLastDatabases").toBool()) {
+        config()->set("LastDatabases", QVariant());
+    }
+
+    if (!config()->get("RememberLastKeyFiles").toBool()) {
+        config()->set("LastKeyFiles", QVariant());
+    }
+
     for (const ExtraPage& page: asConst(m_extraPages)) {
         page.saveSettings();
     }