From 5a2b8b7cfdee1341552a6f9c1b7277d7c21df951 Mon Sep 17 00:00:00 2001 From: angelblue05 Date: Tue, 13 Oct 2015 05:41:28 -0500 Subject: [PATCH] Fix delete settings --- resources/language/English/strings.xml | 4 ++-- resources/language/German/strings.xml | 4 ++-- resources/lib/Player.py | 11 ++++++----- resources/settings.xml | 4 ++-- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml index a5c50521..c5b355b2 100644 --- a/resources/language/English/strings.xml +++ b/resources/language/English/strings.xml @@ -98,8 +98,8 @@ Include People Include Overview Offer delete after playback - - For Episodes - - For Movies + For Episodes + For Movies Background Art Refresh Rate (seconds) Add Resume Percent Add Episode Number diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml index 4d6dbba3..cd9473c2 100644 --- a/resources/language/German/strings.xml +++ b/resources/language/German/strings.xml @@ -97,8 +97,8 @@ Lade Darsteller Lade Inhaltsübersicht Löschen von Medien nach dem Abspielen anbieten - - Für Episoden - - Für Filme + Für Episoden + Für Filme Aktualisierungsintervall von Hintergrundbildern (Sekunden) Prozentanzeige für Fortsetzen Episodennummer hinzufügen diff --git a/resources/lib/Player.py b/resources/lib/Player.py index 8dfa27d3..12d281a2 100644 --- a/resources/lib/Player.py +++ b/resources/lib/Player.py @@ -394,16 +394,17 @@ class Player( xbmc.Player ): utils.window('SkipWatched%s' % itemId, "true") self.stopPlayback(data) - offerDelete = False + offerDelete = utils.settings('offerDelete') == "true" + offerTypeDelete = False if type == "Episode" and utils.settings('offerDeleteTV') == "true": - offerDelete = True + offerTypeDelete = True elif type == "Movie" and utils.settings('offerDeleteMovies') == "true": - offerDelete = True + offerTypeDelete = True - if percentComplete >= markPlayedAt and offerDelete: - # Item could be stacked, so only offer to delete the main item. + if percentComplete >= markPlayedAt and offerDelete and offerTypeDelete: + # Make the bigger setting be able to disable option easily. self.logMsg("Offering deletion for: %s." % itemId, 1) return_value = xbmcgui.Dialog().yesno("Offer Delete", "Delete %s" % currentFile.split("/")[-1], "on Emby Server?") if return_value: diff --git a/resources/settings.xml b/resources/settings.xml index c496e3e4..a0afbfb0 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -37,8 +37,8 @@ - - + +