From 0dddc5eb7b60efd4f124485fd6e3e982c04f8a28 Mon Sep 17 00:00:00 2001
From: Mikaël Capelle <capelle.mikael@gmail.com>
Date: Wed, 11 Nov 2020 14:08:23 +0100
Subject: Fix handling of previous 'enabled' settings.

---
 src/settings.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/settings.cpp')

diff --git a/src/settings.cpp b/src/settings.cpp
index a76d5e76..db48cfd2 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1280,19 +1280,22 @@ void PluginSettings::registerPlugin(IPlugin *plugin)
     const QString settingName = plugin->name() + "/" + setting.key;
 
     QVariant temp = get<QVariant>(
-      m_Settings, "Plugins", settingName, setting.defaultValue);
+      m_Settings, "Plugins", settingName, QVariant());
 
-    if (!temp.convert(setting.defaultValue.type())) {
+    // No previous enabled? Skip.
+    if (setting.key == "enabled" && (!temp.isValid() || !temp.canConvert<bool>())) {
+      continue;
+    }
+
+    if (!temp.isValid()) {
+      temp = setting.defaultValue;
+    }
+    else if (!temp.convert(setting.defaultValue.type())) {
       log::warn(
         "failed to interpret \"{}\" as correct type for \"{}\" in plugin \"{}\", using default",
         temp.toString(), setting.key, plugin->name());
 
       temp = setting.defaultValue;
-
-      // If there was no previous "enabled" value, skip it:
-      if (setting.key == "enabled") {
-        continue;
-      }
     }
 
     m_PluginSettings[plugin->name()][setting.key] = temp;
-- 
cgit v1.3.1