From: Kalle Wallin <kaw@linux.se>
Date: Wed, 31 Mar 2004 14:22:55 +0000 (+0000)
Subject: Only delete a song if it exits.
X-Git-Tag: v0.12_alpha1~613
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fbd98e8deb69cd2dc11479efccf3798152010a47;p=ncmpc.git

Only delete a song if it exits.


git-svn-id: https://svn.musicpd.org/ncmpc/trunk@557 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---

diff --git a/screen_play.c b/screen_play.c
index 72c223e..151402d 100644
--- a/screen_play.c
+++ b/screen_play.c
@@ -130,11 +130,14 @@ play_cmd(screen_t *screen, mpd_client_t *c, command_t cmd)
     {
     case CMD_DELETE:
       song = mpc_playlist_get_song(c, screen->playlist->selected);
-      file_clear_highlight(c, song);
-      mpd_sendDeleteCommand(c->connection, screen->playlist->selected);
-      mpd_finishCommand(c->connection);
-      screen_status_printf("Removed \'%s\' from playlist!",
-			   mpc_get_song_name(song));
+      if( song )
+	{
+	  file_clear_highlight(c, song);
+	  mpd_sendDeleteCommand(c->connection, screen->playlist->selected);
+	  mpd_finishCommand(c->connection);
+	  screen_status_printf("Removed \'%s\' from playlist!",
+			       mpc_get_song_name(song));
+	}
       return 1;
     case CMD_SAVE_PLAYLIST:
       handle_save_playlist(screen, c);