diff --git a/platformcode/launcher.py b/platformcode/launcher.py index 6116e82d..066d6230 100644 --- a/platformcode/launcher.py +++ b/platformcode/launcher.py @@ -434,6 +434,7 @@ def play_from_library(item): else: # Pop-up window from specials import videolibrary, autoplay + # from core.support import dbg;dbg() p_dialog = platformtools.dialog_progress_bg(config.get_localized_string(20000), config.get_localized_string(60683)) p_dialog.update(0, '') item.play_from = 'window' @@ -442,7 +443,7 @@ def play_from_library(item): while platformtools.is_playing(): # Conventional window sleep(1) play_time = platformtools.resume_playback(item, True) - if not play_time: + if not play_time and config.get_setting('autoplay'): return # The number of links to show is limited diff --git a/resources/skins/Default/720p/NextDialogCompact.xml b/resources/skins/Default/720p/NextDialogCompact.xml index d698b0da..740f674b 100644 --- a/resources/skins/Default/720p/NextDialogCompact.xml +++ b/resources/skins/Default/720p/NextDialogCompact.xml @@ -4,12 +4,11 @@ Dialog.Close(fullscreeninfo,true) Dialog.Close(videoosd,true) - - horizontal + 15 + 0 + 140 40 - 0 - right @@ -18,43 +17,52 @@ - - - 40 - 80 - font30_title - 10 - 80FFFFFF - FFFFFFFF - 80FFFFFF - 22000000 - center - left - NextDialog/play.png - NextDialog/play.png - no - - - - 40 - 40 - font30_title - 30 - 80FFFFFF - FFFFFFFF - 80FFFFFF - 22000000 - center - center - NextDialog/close.png - NextDialog/close.png - no - - + 0 - 20 + 0 + 100% + 100% + white.png + + + horizontal + 0 + 20 40 - NextDialog/background.png + 0 + right + + + 40 + 80 + font30_title + 10 + 80FFFFFF + FFFFFFFF + 80FFFFFF + 22000000 + center + left + NextDialog/play.png + NextDialog/play.png + no + + + + 40 + 40 + font30_title + 30 + 80FFFFFF + FFFFFFFF + 80FFFFFF + 22000000 + center + center + NextDialog/close.png + NextDialog/close.png + no + diff --git a/resources/skins/Default/media/NextDialog/background.png b/resources/skins/Default/media/NextDialog/background.png deleted file mode 100644 index bdd2689e..00000000 Binary files a/resources/skins/Default/media/NextDialog/background.png and /dev/null differ diff --git a/resources/skins/Default/media/NextDialog/close.png b/resources/skins/Default/media/NextDialog/close.png index b6e4ece7..cd19c599 100644 Binary files a/resources/skins/Default/media/NextDialog/close.png and b/resources/skins/Default/media/NextDialog/close.png differ diff --git a/resources/skins/Default/media/NextDialog/play.png b/resources/skins/Default/media/NextDialog/play.png index 12aedfa5..70d3cbb6 100644 Binary files a/resources/skins/Default/media/NextDialog/play.png and b/resources/skins/Default/media/NextDialog/play.png differ diff --git a/specials/autoplay.py b/specials/autoplay.py index 3b15f8bb..e0a771c5 100644 --- a/specials/autoplay.py +++ b/specials/autoplay.py @@ -182,8 +182,9 @@ def start(itemlist, item): autoplay_list.sort(key=lambda orden: (orden['indice_quality'], orden['indice_server'])) # Plan b is prepared, in case it is active the non-favorite elements are added at the end - try: plan_b = settings_node['plan_b'] - except: plan_b = True + # try: plan_b = settings_node['plan_b'] + # except: + plan_b = True text_b = '' if plan_b: autoplay_list.extend(autoplay_b) # If there are elements in the autoplay list, an attempt is made to reproduce each element, until one is found or all fail.