Merge branch 'FreeTubeApp:development' into development

This is an automated nightly publish.
MarmadileManteater · Sep 17, 2022 · 54741b2 · 54741b2
2 parents f13942a + 01fe362
commit 54741b2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/renderer/components/general-settings/general-settings.js b/src/renderer/components/general-settings/general-settings.js
@@ -55,7 +55,8 @@ export default Vue.extend({
         '',
         'openLinkAfterPrompt',
         'doNothing'
-      ]
+      ],
+      usingElectron: process.env.IS_ELECTRON
     }
   },
   computed: {

diff --git a/src/renderer/components/general-settings/general-settings.vue b/src/renderer/components/general-settings/general-settings.vue
@@ -15,6 +15,7 @@
           @change="updateCheckForUpdates"
         />
         <ft-toggle-switch
+          v-if="usingElectron"
           :label="$t('Settings.General Settings.Fallback to Non-Preferred Backend on Failure')"
           :default-value="backendFallback"
           :compact="true"
@@ -39,6 +40,7 @@
     </div>
     <div class="switchGrid">
       <ft-select
+        v-if="usingElectron"
         :placeholder="$t('Settings.General Settings.Preferred API Backend.Preferred API Backend')"
         :value="backendPreference"
         :select-names="backendNames"

diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
@@ -271,10 +271,6 @@ const state = {
   screenshotFilenamePattern: '%Y%M%D-%H%N%S'
 }
 
-if (window.BrowserFS !== undefined) {
-  state.backendPreference = 'invidious'
-}
-
 const stateWithSideEffects = {
   currentLocale: {
     defaultValue: 'en-US',