From e302fbfb73ba6d089f743cfee2beb24963c9dd65 Mon Sep 17 00:00:00 2001
From: grafixeyehero <32230989+grafixeyehero@users.noreply.github.com>
Date: Wed, 5 May 2021 23:40:51 +0300
Subject: [PATCH 1/2] Enable history for dialog hash

---
 src/components/dialogHelper/dialogHelper.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/dialogHelper/dialogHelper.js b/src/components/dialogHelper/dialogHelper.js
index a8410fcf70..1f979bbcee 100644
--- a/src/components/dialogHelper/dialogHelper.js
+++ b/src/components/dialogHelper/dialogHelper.js
@@ -379,7 +379,7 @@ import '../../assets/css/scrollstyles.scss';
             dlg.setAttribute('data-lockscroll', 'true');
         }
 
-        if (options.enableHistory === true) {
+        if (options.enableHistory !== false) {
             dlg.setAttribute('data-history', 'true');
         }
 

From 924e5bc7b9c3767819c359d2471a7da6a16d0976 Mon Sep 17 00:00:00 2001
From: grafixeyehero <32230989+grafixeyehero@users.noreply.github.com>
Date: Wed, 5 May 2021 23:48:24 +0300
Subject: [PATCH 2/2] Fix accessing playersettingsmenu, groupSelectionMenu &
 playback video (Audio, Subtitles)

---
 src/components/playback/playersettingsmenu.js    | 15 ++++++++++-----
 src/components/syncPlay/ui/groupSelectionMenu.js |  6 ++++--
 src/controllers/playback/video/index.js          |  6 ++++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/components/playback/playersettingsmenu.js b/src/components/playback/playersettingsmenu.js
index cc05d6e704..f2fd6f4d8d 100644
--- a/src/components/playback/playersettingsmenu.js
+++ b/src/components/playback/playersettingsmenu.js
@@ -41,7 +41,8 @@ function showQualityMenu(player, btn) {
 
     return actionsheet.show({
         items: menuItems,
-        positionTo: btn
+        positionTo: btn,
+        enableHistory: false
     }).then(function (id) {
         const bitrate = parseInt(id);
         if (bitrate !== selectedBitrate) {
@@ -77,7 +78,8 @@ function showRepeatModeMenu(player, btn) {
 
     return actionsheet.show({
         items: menuItems,
-        positionTo: btn
+        positionTo: btn,
+        enableHistory: false
     }).then(function (mode) {
         if (mode) {
             playbackManager.setRepeatMode(mode, player);
@@ -138,7 +140,8 @@ function showAspectRatioMenu(player, btn) {
 
     return actionsheet.show({
         items: menuItems,
-        positionTo: btn
+        positionTo: btn,
+        enableHistory: false
     }).then(function (id) {
         if (id) {
             playbackManager.setAspectRatio(id, player);
@@ -160,7 +163,8 @@ function showPlaybackRateMenu(player, btn) {
 
     return actionsheet.show({
         items: menuItems,
-        positionTo: btn
+        positionTo: btn,
+        enableHistory: false
     }).then(function (id) {
         if (id) {
             playbackManager.setPlaybackRate(id, player);
@@ -237,7 +241,8 @@ function showWithUser(options, player, user) {
 
     return actionsheet.show({
         items: menuItems,
-        positionTo: options.positionTo
+        positionTo: options.positionTo,
+        enableHistory: false
     }).then(function (id) {
         return handleSelectedOption(id, options, player);
     });
diff --git a/src/components/syncPlay/ui/groupSelectionMenu.js b/src/components/syncPlay/ui/groupSelectionMenu.js
index 96a7310381..48c1327ea7 100644
--- a/src/components/syncPlay/ui/groupSelectionMenu.js
+++ b/src/components/syncPlay/ui/groupSelectionMenu.js
@@ -63,7 +63,8 @@ class GroupSelectionMenu {
                     items: menuItems,
                     positionTo: button,
                     resolveOnClick: true,
-                    border: true
+                    border: true,
+                    enableHistory: false
                 };
 
                 actionsheet.show(menuOptions).then(function (id) {
@@ -132,7 +133,8 @@ class GroupSelectionMenu {
             items: menuItems,
             positionTo: button,
             resolveOnClick: true,
-            border: true
+            border: true,
+            enableHistory: false
         };
 
         actionsheet.show(menuOptions).then(function (id) {
diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js
index 77ca253812..a60aa8a7c9 100644
--- a/src/controllers/playback/video/index.js
+++ b/src/controllers/playback/video/index.js
@@ -902,7 +902,8 @@ import { appRouter } from '../../../components/appRouter';
                 actionsheet.show({
                     items: menuItems,
                     title: globalize.translate('Audio'),
-                    positionTo: positionTo
+                    positionTo: positionTo,
+                    enableHistory: false
                 }).then(function (id) {
                     const index = parseInt(id);
 
@@ -948,7 +949,8 @@ import { appRouter } from '../../../components/appRouter';
                 actionsheet.show({
                     title: globalize.translate('Subtitles'),
                     items: menuItems,
-                    positionTo: positionTo
+                    positionTo: positionTo,
+                    enableHistory: false
                 }).then(function (id) {
                     const index = parseInt(id);