Merge remote-tracking branch 'MediaBrowser/master' into develop
This commit is contained in:
commit
abcb438f21
2 changed files with 8 additions and 1 deletions
|
@ -140,7 +140,7 @@ class Main:
|
||||||
# Other functions
|
# Other functions
|
||||||
if mode == "settings":
|
if mode == "settings":
|
||||||
xbmc.executebuiltin('Addon.OpenSettings(plugin.video.plexkodiconnect)')
|
xbmc.executebuiltin('Addon.OpenSettings(plugin.video.plexkodiconnect)')
|
||||||
elif mode in ("manualsync", "repair"):
|
elif mode in ("manualsync", "fastsync", "repair"):
|
||||||
if utils.window('emby_online') != "true":
|
if utils.window('emby_online') != "true":
|
||||||
# Server is not online, do not run the sync
|
# Server is not online, do not run the sync
|
||||||
xbmcgui.Dialog().ok(heading="PlexKodiConnect",
|
xbmcgui.Dialog().ok(heading="PlexKodiConnect",
|
||||||
|
|
|
@ -146,6 +146,13 @@ class KodiMonitor(xbmc.Monitor):
|
||||||
xbmc.sleep(10000)
|
xbmc.sleep(10000)
|
||||||
utils.window('emby_onWake', value="true")
|
utils.window('emby_onWake', value="true")
|
||||||
|
|
||||||
|
|
||||||
|
elif method == "GUI.OnScreensaverDeactivated":
|
||||||
|
if utils.settings('dbSyncScreensaver') == "true":
|
||||||
|
xbmc.sleep(5000);
|
||||||
|
utils.window('emby_onWake', value="true")
|
||||||
|
|
||||||
|
|
||||||
elif method == "Playlist.OnClear":
|
elif method == "Playlist.OnClear":
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue