fix search release

#296
fgl27 · Jun 26, 2024 · 18ce13d · 18ce13d
1 parent a572d0f
commit 18ce13d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/specific/Main.js b/app/specific/Main.js
@@ -745,15 +745,17 @@ function Main_SwitchScreenAction(removekey) {
     if (Main_values.Main_Go !== Main_aGame) Main_values.Main_BeforeAgameisSet = false;
 
     Main_CounterDialogRst();
-
     if (Main_Switchobj[Main_values.Main_Go]) Main_Switchobj[Main_values.Main_Go]();
     else Main_Switchobj[1]();
 
     if (removekey) Main_RemoveKeys();
 }
 
 function Main_OpenSearch() {
-    if (!Main_values.Search_isSearching) Main_values.Main_BeforeSearch = Main_values.Main_Go;
+    if (!Main_values.Search_isSearching) {
+        Main_values.Main_BeforeSearch = Main_values.Main_Go;
+    }
+
     Main_ExitCurrent(Main_values.Main_Go);
     Main_values.Main_Go = Main_Search;
     Main_HideWarningDialog();

diff --git a/app/specific/Screens.js b/app/specific/Screens.js
@@ -616,7 +616,7 @@ function Screens_loadDataSuccessFinish() {
                 });
             } else {
                 Main_ready(function () {
-                    //Values that need to be reset to prevent app odd behavier
+                    //Values that need to be reset to prevent app odd behavior
                     Main_values.Search_isSearching = false;
                     Main_values.Main_BeforeChannelisSet = false;
                     Main_values.Main_BeforeAgameisSet = false;

diff --git a/app/specific/Sidepannel.js b/app/specific/Sidepannel.js
@@ -144,8 +144,9 @@ function Sidepannel_KeyEnterBase() {
             if (
                 !Main_values.Search_isSearching &&
                 (Main_values.Main_Go === Main_ChannelContent || Main_values.Main_Go === Main_ChannelClip || Main_values.Main_Go === Main_ChannelVod)
-            )
+            ) {
                 ChannelContent_SetChannelValue();
+            }
             Main_OpenSearch();
         } else document.body.addEventListener('keydown', Sidepannel_Callback, false);
     } else if (Main_values.Sidepannel_Pos === 8) {
@@ -199,6 +200,7 @@ function Sidepannel_Go(GoTo) {
         document.body.addEventListener('keydown', Sidepannel_Callback, false);
         Main_SwitchScreenAction();
     } else {
+        Main_values.Search_isSearching = false;
         Main_values.Main_Before = Main_values.Main_Go;
         Main_values.Main_Go = GoTo;
         Main_ExitCurrent(Main_values.Main_Before);