From 26836fb53656dc2f543c0c4ba5b2be7b4c62eb57 Mon Sep 17 00:00:00 2001
From: angelblue05 <tamara.angel05@gmail.com>
Date: Fri, 12 Feb 2016 16:49:21 -0600
Subject: [PATCH] Remove skip deletion after playback

I think it must be a mistake on my part. Checking history, it looks like
a copy paste during the refactor.
---
 resources/language/English/strings.xml |  6 ++----
 resources/lib/player.py                | 13 ++++++-------
 resources/settings.xml                 |  6 ++----
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 21b92ce4..cabd3e9b 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -286,7 +286,7 @@
     <string id="30517">Network credentials</string>
     <string id="30518">Enable Emby cinema mode</string>
     <string id="30519">Ask to play trailers</string>
-    <string id="30520">Skip Emby delete confirmation</string>
+    <string id="30520">Skip Emby delete confirmation for the context menu</string>
     <string id="30521">Jump back on resume (in seconds)</string>
     <string id="30522">Force transcode H265</string>
     <string id="30523">Music metadata options (not compatible with direct stream)</string>
@@ -300,9 +300,7 @@
     <string id="30531">Enable new content notification</string>
     <string id="30532">Duration of the video library pop up (in seconds)</string>
     <string id="30533">Duration of the music library pop up (in seconds)</string>
-    <string id="30534">For the context menu</string>
-    <string id="30535">After playback (Caution!)</string>
-    <string id="30536">Server messages</string>
+    <string id="30534">Server messages</string>
 
     <!-- service add-on -->
     <string id="33000">Welcome</string>
diff --git a/resources/lib/player.py b/resources/lib/player.py
index ecc6ac64..ed3fb414 100644
--- a/resources/lib/player.py
+++ b/resources/lib/player.py
@@ -482,13 +482,12 @@ class Player(xbmc.Player):
                         offerDelete = False
 
                     if percentComplete >= markPlayedAt and offerDelete:
-                        if utils.settings('skipPlayback') != "true":
-                            resp = xbmcgui.Dialog().yesno(
-                                                    heading="Confirm delete",
-                                                    line1="Delete file on Emby Server?")
-                            if not resp:
-                                self.logMsg("User skipped deletion.", 1)
-                                continue
+                        resp = xbmcgui.Dialog().yesno(
+                                                heading="Confirm delete",
+                                                line1="Delete file on Emby Server?")
+                        if not resp:
+                            self.logMsg("User skipped deletion.", 1)
+                            continue
 
                         url = "{server}/emby/Items/%s?format=json" % itemid
                         self.logMsg("Deleting request: %s" % itemid)
diff --git a/resources/settings.xml b/resources/settings.xml
index 40ce0a7d..7f7482f5 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -62,11 +62,9 @@
 	<category label="30235"><!-- Extras -->
 	    <setting id="enableCoverArt" type="bool" label="30157" default="true" />
 	    <setting id="ignoreSpecialsNextEpisodes" type="bool" label="30527" default="false" />
+	    <setting id="skipContextMenu" type="bool" label="30520" default="false" />
 		<setting id="additionalUsers" type="text" label="30528" default="" />
-		<setting type="lsep" label="30520" />
-	    <setting id="skipContextMenu" type="bool" label="30534" default="false" />
-	    <setting id="skipPlayback" type="bool" label="30535" default="false" />
-		<setting type="lsep" label="30536" />
+		<setting type="lsep" label="30534" />
 		<setting id="connectMsg" type="bool" label="30249" default="true" />
         <setting id="restartMsg" type="bool" label="30530" default="false" />
         <setting id="newContent" type="bool" label="30531" default="false" />