From e8dfe5a87df1d3155004ccf59363d4a9724300a6 Mon Sep 17 00:00:00 2001
From: Party Wumpus <48649272+PartyWumpus@users.noreply.github.com>
Date: Thu, 15 Jun 2023 13:53:02 +0100
Subject: When decky is uncertain of branch, set the setting to match the guess
 (#480)

* If branch setting is missing, set it using the 'guess' from backend

* Make the frontend default to stable branch like the backend
---
 backend/updater.py                                              | 2 ++
 frontend/src/components/settings/pages/general/BranchSelect.tsx | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/updater.py b/backend/updater.py
index 363ae12a..61124a72 100644
--- a/backend/updater.py
+++ b/backend/updater.py
@@ -67,9 +67,11 @@ class Updater:
             logger.info("Current branch is not set, determining branch from version...")
             if self.localVer.startswith("v") and "-pre" in self.localVer:
                 logger.info("Current version determined to be pre-release")
+                manager.setSetting('branch', 1)
                 return 1
             else:
                 logger.info("Current version determined to be stable")
+                manager.setSetting('branch', 0)
                 return 0
         return ver
 
diff --git a/frontend/src/components/settings/pages/general/BranchSelect.tsx b/frontend/src/components/settings/pages/general/BranchSelect.tsx
index d966ff62..9b304f3a 100644
--- a/frontend/src/components/settings/pages/general/BranchSelect.tsx
+++ b/frontend/src/components/settings/pages/general/BranchSelect.tsx
@@ -21,7 +21,7 @@ const BranchSelect: FunctionComponent<{}> = () => {
     t('BranchSelect.update_channel.prerelease'),
     t('BranchSelect.update_channel.testing'),
   ];
-  const [selectedBranch, setSelectedBranch] = useSetting<UpdateBranch>('branch', UpdateBranch.Prerelease);
+  const [selectedBranch, setSelectedBranch] = useSetting<UpdateBranch>('branch', UpdateBranch.Stable);
 
   return (
     // Returns numerical values from 0 to 2 (with current branch setup as of 8/28/22)
-- 
cgit v1.2.3