From c8c5aa079e3a8995569133ac1645693b21d2d609 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Tue, 6 Oct 2009 09:19:06 +0200 Subject: [PATCH] fix appending now playing song prefix/suffix if playlist is filtered --- src/display.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/display.cpp b/src/display.cpp index e42918a9..12d6ae44 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -105,7 +105,7 @@ void Display::SongsInColumns(const MPD::Song &s, void *, Menu *menu) if (!s.Localized()) const_cast(&s)->Localize(); - bool is_now_playing = menu == myPlaylist->Items && menu->CurrentlyDrawedPosition() == size_t(myPlaylist->NowPlaying); + bool is_now_playing = menu == myPlaylist->Items && (menu->isFiltered() ? s.GetPosition() : menu->CurrentlyDrawedPosition()) == size_t(myPlaylist->NowPlaying); if (is_now_playing) *menu << Config.now_playing_prefix; @@ -217,7 +217,7 @@ void Display::Songs(const MPD::Song &s, void *data, Menu *menu) if (!s.Localized()) const_cast(&s)->Localize(); - bool is_now_playing = menu == myPlaylist->Items && menu->CurrentlyDrawedPosition() == size_t(myPlaylist->NowPlaying); + bool is_now_playing = menu == myPlaylist->Items && (menu->isFiltered() ? s.GetPosition() : menu->CurrentlyDrawedPosition()) == size_t(myPlaylist->NowPlaying); if (is_now_playing) *menu << Config.now_playing_prefix;