Merge remote-tracking branch 'origin/master'

This commit is contained in:
marco
2020-01-16 21:22:48 +01:00
9 changed files with 24 additions and 30 deletions

View File

@@ -473,7 +473,6 @@ def play_from_library(item):
else:
# Ventana emergente
item.play_from = 'window'
item.show_server = True
from specials import videolibrary, autoplay
@@ -543,13 +542,13 @@ def play_from_library(item):
return
else:
item = videolibrary.play(itemlist[seleccion])[0]
item.play_from = 'window'
platformtools.play_video(item)
if (platformtools.is_playing() and item.action) or item.server == 'torrent' or autoplay.is_active(item.contentChannel):
break
if it.show_server and check_next_ep:
logger.info('PARTITO')
nextep.run(it)
sleep(0.5)
p_dialog.close()