Fix segfault when selected channel disappears

Next-Flip · Aug 21, 2024 · f113ef9 · f113ef9
1 parent 25691ce
commit f113ef9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 0 deletions.
diff --git a/application/applicationupdateregistry.cpp b/application/applicationupdateregistry.cpp
@@ -14,3 +14,8 @@ const QString ApplicationUpdateRegistry::updateChannel() const
 {
     return globalPrefs->applicationUpdateChannel();
 }
+
+void ApplicationUpdateRegistry::setUpdateChannel(const QString &newUpdateChannel) const
+{
+    globalPrefs->setApplicationUpdateChannel(newUpdateChannel);
+}
diff --git a/application/applicationupdateregistry.h b/application/applicationupdateregistry.h
@@ -10,6 +10,7 @@ class ApplicationUpdateRegistry : public Flipper::UpdateRegistry
 
 private:
     const QString updateChannel() const override;
+    void setUpdateChannel(const QString &newUpdateChannel) const override;
 };
 
 
diff --git a/backend/firmwareupdateregistry.cpp b/backend/firmwareupdateregistry.cpp
@@ -14,3 +14,8 @@ const QString FirmwareUpdateRegistry::updateChannel() const
 {
     return globalPrefs->firmwareUpdateChannel();
 }
+
+void FirmwareUpdateRegistry::setUpdateChannel(const QString &newUpdateChannel) const
+{
+    globalPrefs->setFirmwareUpdateChannel(newUpdateChannel);
+}
diff --git a/backend/firmwareupdateregistry.h b/backend/firmwareupdateregistry.h
@@ -13,6 +13,7 @@ class FirmwareUpdateRegistry : public UpdateRegistry
 
 private:
     const QString updateChannel() const override;
+    void setUpdateChannel(const QString &newUpdateChannel) const override;
 };
 
 }

diff --git a/backend/updateregistry.cpp b/backend/updateregistry.cpp
@@ -76,6 +76,10 @@ void UpdateRegistry::fillFromJson(const QByteArray &text)
     } catch(std::runtime_error &e) {
         qCCritical(CATEGORY_UPDATES) << "Failed to parse update information:" << e.what();
     }
+
+    if(!m_channels.contains(updateChannel())) {
+        setUpdateChannel(QStringLiteral("release"));
+    }
 }
 
 const QStringList UpdateRegistry::channelNames() const

diff --git a/backend/updateregistry.h b/backend/updateregistry.h
@@ -53,6 +53,7 @@ public slots:
 
 private:
     virtual const QString updateChannel() const = 0;
+    virtual void setUpdateChannel(const QString &newUpdateChannel) const = 0;
     void setState(State newState);
 
     QString m_directoryUrl;