diff --git a/addon.xml b/addon.xml index e9764d95..6ffbf944 100644 --- a/addon.xml +++ b/addon.xml @@ -1,19 +1,19 @@ - + + - Provides a netflix style pop up notification for watching the next episode with fancy/simple + Provides a netflix style pop up notification for watching the next episode with fancy/simple modes. - Provides a netflix style pop up notification for watching the next episode with + Provides a netflix style pop up notification for watching the next episode with fancy/simple modes. A prompt to check if your still watching also occurs after a few automatically watched shows in a row. all - icon.png fanart.jpg diff --git a/resources/lib/developer.py b/resources/lib/developer.py index 7a028ddb..80914c07 100644 --- a/resources/lib/developer.py +++ b/resources/lib/developer.py @@ -24,7 +24,8 @@ def developer_play_back(): still_watching_page_simple.show() utils.window('service.upnext.dialog', 'true') - while (xbmc.Player().isPlaying() and not next_up_page.isCancel() and + player = xbmc.Player() + while (player.isPlaying() and not next_up_page.isCancel() and not next_up_page.isWatchNow() and not still_watching_page.isStillWatching() and not still_watching_page.isCancel()): xbmc.sleep(100) diff --git a/resources/lib/utils.py b/resources/lib/utils.py index c949d21b..28095d9e 100644 --- a/resources/lib/utils.py +++ b/resources/lib/utils.py @@ -6,12 +6,8 @@ import json -def addon_id(): - return "service.upnext" - - def addon_path(): - return xbmcaddon.Addon(addon_id()).getAddonInfo('path') + return xbmcaddon.Addon().getAddonInfo('path') def kodi_version(): @@ -19,11 +15,11 @@ def kodi_version(): def addon_name(): - return xbmcaddon.Addon(addon_id()).getAddonInfo('name').upper() + return xbmcaddon.Addon().getAddonInfo('name').upper() def addon_version(): - return xbmcaddon.Addon(addon_id()).getAddonInfo('version') + return xbmcaddon.Addon().getAddonInfo('version') def window(key, value=None, clear=False, window_id=10000): @@ -57,7 +53,7 @@ def window(key, value=None, clear=False, window_id=10000): def settings(setting, value=None): - addon = xbmcaddon.Addon(addon_id()) + addon = xbmcaddon.Addon() if value is not None: if setting.endswith('.bool'):