Merge remote-tracking branch 'MediaBrowser/master'

This commit is contained in:
tomkat83 2015-12-28 13:13:26 +01:00
commit 488c1a0a19

View file

@ -148,18 +148,6 @@ class KodiMonitor(xbmc.Monitor):
self.logMsg("Item is invalid for emby deletion.", 1) self.logMsg("Item is invalid for emby deletion.", 1)
else: else:
# Send the delete action to the server. # Send the delete action to the server.
offerDelete = False
if type == "episode" and utils.settings('deleteTV') == "true":
offerDelete = True
elif type == "movie" and utils.settings('deleteMovies') == "true":
offerDelete = True
if utils.settings('offerDelete') != "true":
# Delete could be disabled, even if the subsetting is enabled.
offerDelete = False
if offerDelete:
embyconn = utils.kodiSQL('emby') embyconn = utils.kodiSQL('emby')
embycursor = embyconn.cursor() embycursor = embyconn.cursor()
emby_db = embydb.Embydb_Functions(embycursor) emby_db = embydb.Embydb_Functions(embycursor)