From 160d8fe4b82fddf4ffa3202158a1c9b043ed2e40 Mon Sep 17 00:00:00 2001
From: saltrafael <76502841+saltrafael@users.noreply.github.com>
Date: Thu, 9 Sep 2021 13:53:27 -0300
Subject: [PATCH] Make autoplay_next pushPrefs and set default value to
 autoplay setting (#7051)

---
 ui/redux/actions/settings.js  | 3 ++-
 ui/redux/reducers/settings.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/redux/actions/settings.js b/ui/redux/actions/settings.js
index 07025ee62..6f61e2476 100644
--- a/ui/redux/actions/settings.js
+++ b/ui/redux/actions/settings.js
@@ -428,8 +428,9 @@ export function toggleVideoTheaterMode() {
 export function toggleAutoplayNext() {
   return (dispatch, getState) => {
     const state = getState();
+    const ready = selectPrefsReady(state);
     const autoplayNext = makeSelectClientSetting(SETTINGS.AUTOPLAY_NEXT)(state);
 
-    dispatch(doSetClientSetting(SETTINGS.AUTOPLAY_NEXT, !autoplayNext));
+    dispatch(doSetClientSetting(SETTINGS.AUTOPLAY_NEXT, !autoplayNext, ready));
   };
 }
diff --git a/ui/redux/reducers/settings.js b/ui/redux/reducers/settings.js
index 2725c20e5..04a553371 100644
--- a/ui/redux/reducers/settings.js
+++ b/ui/redux/reducers/settings.js
@@ -70,7 +70,7 @@ const defaultState = {
     // Content
     [SETTINGS.SHOW_MATURE]: false,
     [SETTINGS.AUTOPLAY_MEDIA]: true,
-    [SETTINGS.AUTOPLAY_NEXT]: true,
+    [SETTINGS.AUTOPLAY_NEXT]: [SETTINGS.AUTOPLAY_MEDIA],
     [SETTINGS.FLOATING_PLAYER]: true,
     [SETTINGS.AUTO_DOWNLOAD]: true,
     [SETTINGS.HIDE_REPOSTS]: SIMPLE_SITE,