Merge remote-tracking branch 'origin/master'

This commit is contained in:
marco
2020-12-21 21:22:44 +01:00
9 changed files with 54 additions and 49 deletions

View File

@@ -1110,9 +1110,7 @@ def play_torrent(item, xlistitem, mediaurl):
selection = 0
if selection >= 0:
xbmcplugin.setResolvedUrl(int(sys.argv[1]), False, xlistitem)
time.sleep(1)
prevent_busy(item)
mediaurl = urllib.quote_plus(item.url)
torr_client = torrent_options[selection][0]
@@ -1131,8 +1129,9 @@ def play_torrent(item, xlistitem, mediaurl):
torrent.mark_auto_as_watched(item)
while is_playing() and not xbmc.Monitor().abortRequested():
time.sleep(3)
if not item.globalsearch:
while is_playing() and not xbmc.Monitor().abortRequested():
time.sleep(3)
def resume_playback(played_time):