#277 More playlist management updates

* always update the client's playlist reference on `playlist save` * remove playlist references from clients on `playlists delete`
LMS-Community · Aug 2, 2020 · 4d757fe · 4d757fe
1 parent 5eb4432
commit 4d757fe
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/Slim/Control/Commands.pm b/Slim/Control/Commands.pm
@@ -1196,9 +1196,7 @@ sub playlistSaveCommand {
 
 	$request->addResult('__playlist_id', $playlistObj->id);
 
-	if ($client && $playlistObj->title ne Slim::Utils::Strings::string('UNTITLED')
-		&& (!$client->currentPlaylist || $playlistObj->id == $client->currentPlaylist->id)
-	) {
+	if ($client && $playlistObj->title ne Slim::Utils::Strings::string('UNTITLED')) {
 		$client->currentPlaylist($playlistObj);
 		$client->currentPlaylistUpdateTime(Time::HiRes::time());
 		$client->currentPlaylistModified(0);
@@ -2300,6 +2298,14 @@ sub playlistsDeleteCommand {
 		});
 	}
 
+	foreach my $client ( Slim::Player::Client::clients() ) {
+		if ($client->currentPlaylist && $client->currentPlaylist->id == $playlistObj->id) {
+			# must send defined, but falsy value
+			$client->currentPlaylist(0);
+			$client->currentPlaylistUpdateTime(Time::HiRes::time());
+		}
+	}
+
 	_wipePlaylist($playlistObj);
 
 	$request->setStatusDone();