Fix plugin URI redirect from search

anxdpanic · Dec 7, 2024 · d47d61f · d47d61f
1 parent dfcd335
commit d47d61f
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/resources/lib/youtube_plugin/kodion/plugin/xbmc/xbmc_plugin.py b/resources/lib/youtube_plugin/kodion/plugin/xbmc/xbmc_plugin.py
@@ -263,14 +263,19 @@ def run(self, provider, context, focused=None):
                 ui.clear_property(CONTENT_TYPE)
 
                 if not options or options.get(provider.RESULT_FALLBACK, True):
-                    result, post_run_action = self.uri_action(
+                    _, _post_run_action = self.uri_action(
                         context,
                         context.get_parent_uri(params={
                             'window_fallback': True,
                             'window_replace': True,
                             'window_return': False,
                         }),
                     )
+                    if post_run_action and _post_run_action:
+                        post_run_action = (post_run_action, _post_run_action)
+                    else:
+                        post_run_action = _post_run_action
+
             cache_to_disc = False
             update_listing = True
 
@@ -285,21 +290,24 @@ def run(self, provider, context, focused=None):
         if container and position:
             context.send_notification(CONTAINER_FOCUS, [container, position])
 
-        if post_run_action:
+        if isinstance(post_run_action, tuple):
+            self.post_run(context, ui, *post_run_action)
+        elif post_run_action:
             self.post_run(context, ui, post_run_action)
         return succeeded
 
     @staticmethod
-    def post_run(context, ui, action, timeout=30):
-        while ui.busy_dialog_active():
-            timeout -= 1
-            if timeout < 0:
-                context.log_error('Multiple busy dialogs active'
-                                  ' - Post run action unable to execute')
-                break
-            context.sleep(1)
-        else:
-            context.execute(action)
+    def post_run(context, ui, *actions, timeout=30):
+        for action in actions:
+            while ui.busy_dialog_active():
+                timeout -= 1
+                if timeout < 0:
+                    context.log_error('Multiple busy dialogs active'
+                                      ' - Post run action unable to execute')
+                    break
+                context.sleep(1)
+            else:
+                context.execute(action)
 
     @staticmethod
     def uri_action(context, uri):