From 02baa2f39ac59a044610ecfada313f1b472f991f Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 7 Oct 2017 12:10:41 +0200 Subject: Fix logic for marking station (deleted) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For songs with no station associated (NULL) “(deleted)” was shown unconditionally. Hide it. Fixes commit 4dfca5b56b441faf4938b6c8e97585f68e468039. --- src/ui.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/ui.c b/src/ui.c index c682ca3..a044c78 100644 --- a/src/ui.c +++ b/src/ui.c @@ -671,16 +671,15 @@ size_t BarUiListSongs (const BarApp_t * const app, if (filter == NULL || (filter != NULL && (BarStrCaseStr (song->artist, filter) != NULL || BarStrCaseStr (song->title, filter) != NULL))) { - const char * const empty = ""; - const char *stationName = "(deleted)"; + const char * const deleted = "(deleted)", * const empty = ""; + const char *stationName = empty; + const PianoStation_t * const station = PianoFindStationById (app->ph.stations, song->stationId); - if (station != NULL) { - if (station != app->curStation) { - stationName = station->name; - } else { - stationName = empty; - } + if (station != NULL && station != app->curStation) { + stationName = station->name; + } else if (station == NULL && song->stationId != NULL) { + stationName = deleted; } char outstr[512], digits[8], duration[8] = "??:??"; -- cgit v1.2.3