Index: Slim/Web/EditPlaylist.pm
===================================================================
--- Slim/Web/EditPlaylist.pm	(revision 3979)
+++ Slim/Web/EditPlaylist.pm	(working copy)
@@ -242,8 +242,17 @@
 	my $ds          = Slim::Music::Info::getCurrentDataStore();
 	my $playlistObj = $ds->objectForId('track', $params->{'id'});
 
-	if ($playlistObj) {
+	$params->{'level'}     = 0;
+	
+	# Warn the user if the playlist already exists.
+	if ($playlistObj && !$params->{'confirm'}) {
 
+		$params->{'DELETE_WARNING'} = 1;
+		$params->{'level'}     = 1;
+		$params->{'playlist'}  = $playlistObj->id;
+
+	} elsif ($playlistObj) {
+
 		removePlaylistFromDisk($playlistObj);
 
 		# Do a fast delete, and then commit it.
@@ -254,7 +263,6 @@
 
 	# Send the user off to the top level browse playlists
 	$params->{'hierarchy'} = 'playlist,playlistTrack';
-	$params->{'level'}     = 0;
 
 	return Slim::Web::Pages::browsedb($client, $params);
 }
Index: HTML/Fishbone/browse_playlist.html
===================================================================
--- HTML/Fishbone/browse_playlist.html	(revision 3979)
+++ HTML/Fishbone/browse_playlist.html	(working copy)
@@ -11,6 +11,7 @@
 		[% IF warn %]<div class="nowplaying"><b>[% "NOTE" | string %]</b> [% "SCAN_WARNING" | string %] [% IF audiodir %][% "SCAN_CLICK" | string %] <a href="browsetree.html?player=[% player | uri %]">[% "HERE" | string %]</a>.[% END %]
 		</div>[% END %]
 		[% IF RENAME_WARNING %]<div class="nowplaying"><p><b>[% "NOTE" | string %]</b> [% "RENAME_WARNING" | string %]</div>[% END %]
+		[% IF DELETE_WARNING %]<div class="nowplaying"><p><b>[% "NOTE" | string %]</b> [% "DELETE_WARNING" | string %]</div>[% END %]
 
 		[% IF playlist.title && playlist.title == untitledString %]
 			[% SET saveButtonName = "SAVE" %]
@@ -22,20 +23,32 @@
 		<div class="nowplaying">
 			<table border="0" cellspacing="0" cellpadding="0" width="100%">
 				<tr><form method="get" action="edit_playlist.html"><td width="325">[% saveButtonName | string %] [% "THIS_PLAYLIST_AS" | string %]
-						<input name="newname" value="[% IF newname; newname; ELSE; playlist.title; END %]" class="stdedit" size="30">
-						<input type="submit" value="[% saveButtonName | string %]" class="stdclick">
-						<input type="hidden" value="[% player %]" name="player">
-						<input type="hidden" name="renamePlaylist" value="1">
-						<input type="hidden" name="id" value="[% playlist.id %]">
-						[% IF RENAME_WARNING %]</td><td valign="absmiddle" width="25"><input align="absmiddle" type="checkbox" name="overwrite" class="stdedit"></td><td>[% "CONFIRM_OVERWRITE" | string %][% END %]
-						<input type="hidden" name="dir" value="[% dir %]"></td></form></tr>
-				</table>
-				
-			<table border="0" cellspacing="0" cellpadding="0" class="nowplaying">
-				<tr><td><a href="edit_playlist.html?player=[% player | uri %]&id=[% playlist.id %]&deletePlaylist=1">[% "DELETE_THIS_PLAYLIST" | string %]</a></td>
-				<td>&nbsp;&nbsp;<img src="[% webroot %]html/images/pixel.grey.gif" width="1" height="100%" border="0">&nbsp;&nbsp;</td>
-				<td><a href="edit_playlist.html?player=[% player | uri %]&id=[% playlist.id %]&editPlaylist=1">[% "EDIT_PLAYLIST" | string %]</a></td></tr>
+					<input name="newname" value="[% IF newname; newname; ELSE; playlist.title; END %]" class="stdedit" size="30">
+					<input type="submit" value="[% saveButtonName | string %]" class="stdclick">
+					<input type="hidden" value="[% player %]" name="player">
+					<input type="hidden" name="renamePlaylist" value="1">
+					<input type="hidden" name="id" value="[% playlist.id %]">
+					[% IF RENAME_WARNING %]</td><td valign="absmiddle" width="25"><input align="absmiddle" type="checkbox" name="overwrite" class="stdedit"></td><td>[% "CONFIRM_OVERWRITE" | string %][% END %]
+					<input type="hidden" name="dir" value="[% dir %]"></td>
+				</form></tr>
 			</table>
+			<table border="0" cellspacing="0" cellpadding="0" width="0">
+				<tr><form method="get" action="edit_playlist.html"><td>
+					<input type="submit" value="[% "DELETE_THIS_PLAYLIST" | string %]" class="stdclick">
+					<input type="hidden" value="[% player %]" name="player">
+					<input type="hidden" name="deletePlaylist" value="1">
+					<input type="hidden" name="id" value="[% playlist.id %]">
+					[% IF DELETE_WARNING %]</td><td valign="absmiddle" width="25"><input align="absmiddle" type="checkbox" name="confirm" class="stdedit"></td><td>[% "CONFIRM_DELETE" | string %][% END %]
+					<input type="hidden" name="dir" value="[% dir %]"></td>
+				</form>
+				<form method="get" action="edit_playlist.html"><td>
+					<input type="submit" value="[% "EDIT_PLAYLIST" | string %]" class="stdclick">
+					<input type="hidden" value="[% player %]" name="player">
+					<input type="hidden" name="editPlaylist" value="1">
+					<input type="hidden" name="id" value="[% playlist.id %]">
+					<input type="hidden" name="dir" value="[% dir %]"></td>
+				</form></tr>
+			</table>
 		</div>
 		[% END %]
 
Index: strings.txt
===================================================================
--- strings.txt	(revision 3979)
+++ strings.txt	(working copy)
@@ -6275,6 +6275,9 @@
 	JP	上書き確認
 	SE	bekräfta överskrivning
 
+CONFIRM_DELETE
+	EN	Confirm Delete
+
 TRACK
 	CZ	Skladba
 	DE	Lied
@@ -7296,6 +7299,9 @@
 	PT	O nome escolhido já existe. Escolha outro nome para a playlist.
 	SE	Namnet du valde används redan. Välj ett annat namn för din låtlista.
 
+DELETE_WARNING
+	EN	Are you sure you want to delete? Check 'confirm delete' to delete your playlist.
+
 SCAN_WARNING
 	CZ	SlimServer stále prohledává hudební archiv, takže se některé položky nyní nemusí zobrazit.
 	DE	Der SlimServer durchsucht immer noch ihr Musikverzeichnis. Deshalb werden einige Lieder in diesem Bereich noch nicht angezeigt.
Index: HTML/Default/browse_playlist.html
===================================================================
--- HTML/Default/browse_playlist.html	(revision 3979)
+++ HTML/Default/browse_playlist.html	(working copy)
@@ -39,6 +39,9 @@
 		[% IF RENAME_WARNING %]
 			<p><b>[% "NOTE" | string %]</b> [% "RENAME_WARNING" | string %]<p><hr>
 		[% END %]
+		[% IF DELETE_WARNING %]
+			<p><b>[% "NOTE" | string %]</b> [% "DELETE_WARNING" | string %]<p><hr>
+		[% END %]
 
 		[% IF playlist.title && playlist.title == untitledString %]
 			[% SET saveButtonName = "SAVE" %]
@@ -61,9 +64,23 @@
 		</form>
 
 		<p>
-		<a href="edit_playlist.html?player=[% player | uri %]&id=[% playlist.id %]&deletePlaylist=1">[% "DELETE_THIS_PLAYLIST" | string %]</a>
-		<p>
-		<a href="edit_playlist.html?player=[% player | uri %]&id=[% playlist.id %]&editPlaylist=1">[% "EDIT_PLAYLIST" | string %]</a>
+		<form method="get" action="edit_playlist.html">
+			<input type="submit" value="[% "DELETE_THIS_PLAYLIST" | string %]" class="stdclick">
+			<input type="hidden" value="[% player %]" name="player">
+			<input type="hidden" name="deletePlaylist" value="1">
+			<input type="hidden" name="id" value="[% playlist.id %]">
+			[% IF DELETE_WARNING %]
+				<input align="absmiddle" type="checkbox" name="confirm">[% "CONFIRM_DELETE" | string %]
+			[% END %]
+			<input type="hidden" name="dir" value="[% dir %]">
+		</form>
+		<form method="get" action="edit_playlist.html">
+			<input type="submit" value="[% "EDIT_PLAYLIST" | string %]" class="stdclick">
+			<input type="hidden" value="[% player %]" name="player">
+			<input type="hidden" name="editPlaylist" value="1">
+			<input type="hidden" name="id" value="[% playlist.id %]">
+			<input type="hidden" name="dir" value="[% dir %]">
+		</form>
 		</p>
 		[% END %]