fix 'media library: fix filter issues'

This commit is contained in:
Andrzej Rybczak
2010-08-16 15:12:48 +02:00
parent d669bec777
commit 1b98b02659
2 changed files with 4 additions and 4 deletions

View File

@@ -201,7 +201,7 @@ void MediaLibrary::Update()
Artists->Refresh(); Artists->Refresh();
} }
if (!hasTwoColumns && !Artists->ReallyEmpty() && Albums->ReallyEmpty() && Songs->ReallyEmpty()) if (!hasTwoColumns && !Artists->Empty() && Albums->ReallyEmpty() && Songs->ReallyEmpty())
{ {
// idle has to be blocked for now since it would be enabled and // idle has to be blocked for now since it would be enabled and
// disabled a few times by each mpd command, which makes no sense // disabled a few times by each mpd command, which makes no sense
@@ -303,14 +303,14 @@ void MediaLibrary::Update()
Albums->Refresh(); Albums->Refresh();
} }
if (!hasTwoColumns && !Artists->ReallyEmpty() && w == Albums && Albums->ReallyEmpty()) if (!hasTwoColumns && !Artists->Empty() && w == Albums && Albums->ReallyEmpty())
{ {
Albums->HighlightColor(Config.main_highlight_color); Albums->HighlightColor(Config.main_highlight_color);
Artists->HighlightColor(Config.active_column_color); Artists->HighlightColor(Config.active_column_color);
w = Artists; w = Artists;
} }
if (!(hasTwoColumns ? Albums->ReallyEmpty() : Artists->ReallyEmpty()) && Songs->ReallyEmpty()) if (!(hasTwoColumns ? Albums->Empty() : Artists->Empty()) && Songs->ReallyEmpty())
{ {
Songs->Reset(); Songs->Reset();
MPD::SongList list; MPD::SongList list;

View File

@@ -2089,7 +2089,7 @@ int main(int argc, char *argv[])
if (s) if (s)
artist = s->GetArtist(); artist = s->GetArtist();
else if (myScreen == myLibrary && myLibrary->Main() == myLibrary->Artists) else if (myScreen == myLibrary && myLibrary->Main() == myLibrary->Artists && !myLibrary->Artists->Empty())
artist = myLibrary->Artists->Current(); artist = myLibrary->Artists->Current();
if (!artist.empty() && myLastfm->SetArtistInfoArgs(artist, Config.lastfm_preferred_language)) if (!artist.empty() && myLastfm->SetArtistInfoArgs(artist, Config.lastfm_preferred_language))