Use redirect in multiple busy dialog crash workaround anxdpanic#938

MoojMidge · Nov 7, 2024 · 8d3f367 · 8d3f367
1 parent 3c7b7a3
commit 8d3f367
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/resources/lib/youtube_plugin/kodion/context/abstract_context.py b/resources/lib/youtube_plugin/kodion/context/abstract_context.py
@@ -265,7 +265,9 @@ def create_uri(self, path=None, params=None, run=False):
         uri = self._plugin_id.join(('plugin://', uri))
 
         if params:
-            uri = '?'.join((uri, urlencode(params)))
+            if isinstance(params, (dict, list, tuple)):
+                params = urlencode(params)
+            uri = '?'.join((uri, params))
 
         return ''.join((
             'RunPlugin(',

diff --git a/resources/lib/youtube_plugin/kodion/plugin/xbmc/xbmc_plugin.py b/resources/lib/youtube_plugin/kodion/plugin/xbmc/xbmc_plugin.py
@@ -13,7 +13,7 @@
 from traceback import format_stack
 
 from ..abstract_plugin import AbstractPlugin
-from ...compatibility import xbmcplugin
+from ...compatibility import urlsplit, xbmcplugin
 from ...constants import (
     BUSY_FLAG,
     CONTAINER_FOCUS,
@@ -312,7 +312,12 @@ def uri_action(context, uri):
 
         elif context.is_plugin_path(uri):
             context.log_debug('Redirecting to: |{0}|'.format(uri))
-            action = 'RunPlugin({0})'.format(uri)
+            uri = urlsplit(uri)
+            action = context.create_uri(
+                (PATHS.ROUTE, uri.path),
+                uri.query,
+                run=True,
+            )
             result = False
 
         else: