Merge pull request #555 from deXol/develop

[BLE] Avoid recreating DeviceSettings, when device type does not change
mooltipass · Dec 13, 2019 · 8483b3a · 8483b3a
2 parents 0d1ba5e + 6e38166
commit 8483b3a
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/Settings/SettingsGuiHelper.cpp b/src/Settings/SettingsGuiHelper.cpp
@@ -77,6 +77,11 @@ void SettingsGuiHelper::createSettingUIMapping()
     {
         delete m_settings;
     }
+    else if (m_settings)
+    {
+        // If type is not different do not recreate m_settings
+        return;
+    }
     m_deviceType = type;
     if (m_deviceType == Common::MP_BLE)
     {