From: Max Kellermann <max@duempel.org>
Date: Thu, 18 Sep 2008 21:35:12 +0000 (+0200)
Subject: screen_browser: removed entity.song!=NULL check
X-Git-Tag: v0.12_alpha1~231
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=479c19084abdafb4fbc4217c5664f6d1ab65e12e;p=ncmpc.git

screen_browser: removed entity.song!=NULL check

It is guaranteed that the "song" attribute is not NULL, remove the
check.
---

diff --git a/src/screen_browser.c b/src/screen_browser.c
index f3ec8ed..0a06e5f 100644
--- a/src/screen_browser.c
+++ b/src/screen_browser.c
@@ -358,6 +358,8 @@ browser_select_entry(mpdclient_t *c, filelist_entry_t *entry,
 	if (entry->entity->type != MPD_INFO_ENTITY_TYPE_SONG)
 		return -1;
 
+	assert(entry->entity->info.song != NULL);
+
 	if (!toggle || (entry->flags & HIGHLIGHT) == 0) {
 		mpd_Song *song = entry->entity->info.song;
 
@@ -372,15 +374,12 @@ browser_select_entry(mpdclient_t *c, filelist_entry_t *entry,
 	} else {
 		/* remove song from playlist */
 		mpd_Song *song = entry->entity->info.song;
+		int idx;
 
 		entry->flags &= ~HIGHLIGHT;
 
-		if (song) {
-			int idx;
-
-			while ((idx = playlist_get_index_from_file(c, song->file)) >=0)
-				mpdclient_cmd_delete(c, idx);
-		}
+		while ((idx = playlist_get_index_from_file(c, song->file)) >=0)
+			mpdclient_cmd_delete(c, idx);
 	}
 
 	return 0;