diff --git a/core/autoplay.py b/core/autoplay.py index 3204e891..b346bb3b 100644 --- a/core/autoplay.py +++ b/core/autoplay.py @@ -230,6 +230,7 @@ def start(itemlist, item): if isinstance(resolved_item[0], list): videoitem.video_urls = resolved_item else: videoitem = resolved_item[0] + play_item.autoplay = True # If not directly reproduce and mark as seen # Check if the item comes from the video library try: diff --git a/core/support.py b/core/support.py index fb356b92..b91566f9 100755 --- a/core/support.py +++ b/core/support.py @@ -1165,7 +1165,6 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru videoitem.quality = quality videoitem.referer = item.url videoitem.action = "play" - videoitem.infoLabels = item.infoLabels # videoitem.nfo = item.nfo # videoitem.strm_path = item.strm_path return videoitem diff --git a/platformcode/globalsearch.py b/platformcode/globalsearch.py index 6f354849..1bdda521 100644 --- a/platformcode/globalsearch.py +++ b/platformcode/globalsearch.py @@ -650,7 +650,7 @@ class SearchWindow(xbmcgui.WindowXML): elif control_id in [SERVERLIST]: server = Item().fromurl(self.getControl(control_id).getSelectedItem().getProperty('item')) - server.new_search=True + server.globalsearch = True return run(server) def Back(self): diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index 7c0f1aea..ebc1c9c7 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -1012,10 +1012,11 @@ def set_player(item, xlistitem, mediaurl, view, strm): item.options = {'strm':False, 'continue':False} # logger.debug("item:\n" + item.tostring('\n')) - if item.new_search: xbmc.executebuiltin("PlayMedia(" + os.path.join(config.get_runtime_path(), "resources", "kod.mp4") + ")") - # Prevent Busy - else: xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xbmcgui.ListItem(path=os.path.join(config.get_runtime_path(), "resources", "kod.mp4"))) - xbmc.Player().stop() + # Prevent Busy + if not item.autoplay: + if item.globalsearch: xbmc.executebuiltin("PlayMedia(" + os.path.join(config.get_runtime_path(), "resources", "kod.mp4") + ")") + else: xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xbmcgui.ListItem(path=os.path.join(config.get_runtime_path(), "resources", "kod.mp4"))) + xbmc.Player().stop() # Moved del conector "torrent" here if item.server == "torrent": diff --git a/resources/skins/Default/720p/GlobalSearch.xml b/resources/skins/Default/720p/GlobalSearch.xml index 146b05cf..c5db8fed 100644 --- a/resources/skins/Default/720p/GlobalSearch.xml +++ b/resources/skins/Default/720p/GlobalSearch.xml @@ -123,7 +123,7 @@ 0 180 270 - $INFO[ListItem.Property(thumb)] + $INFO[ListItem.Property(thumb)] !Control.HasFocus(102) 10 scale @@ -147,7 +147,7 @@ 0 380 570 - $INFO[ListItem.Property(thumb)] + $INFO[ListItem.Property(thumb)] !Control.HasFocus(102) 10 scale