fix refreshing songs column in media library if albums column is empty

This commit is contained in:
unK
2008-09-06 11:07:32 +02:00
parent 5de59033e4
commit 6ab5a1961f

View File

@@ -473,6 +473,7 @@ int main(int argc, char *argv[])
vFoundPositions.clear(); vFoundPositions.clear();
TagList list; TagList list;
mLibAlbums->Clear(0); mLibAlbums->Clear(0);
mLibSongs->Clear(0);
Mpd->GetArtists(list); Mpd->GetArtists(list);
sort(list.begin(), list.end(), CaseInsensitiveComparison); sort(list.begin(), list.end(), CaseInsensitiveComparison);
for (TagList::const_iterator it = list.begin(); it != list.end(); it++) for (TagList::const_iterator it = list.begin(); it != list.end(); it++)
@@ -481,10 +482,9 @@ int main(int argc, char *argv[])
mLibArtists->Refresh(); mLibArtists->Refresh();
} }
if (mLibAlbums->Empty()) if (mLibAlbums->Empty() && mLibSongs->Empty())
{ {
mLibAlbums->Reset(); mLibAlbums->Reset();
mLibSongs->Clear(0);
vAlbums.clear(); vAlbums.clear();
TagList list; TagList list;
Mpd->GetAlbums(mLibArtists->GetOption(), list); Mpd->GetAlbums(mLibArtists->GetOption(), list);
@@ -649,7 +649,10 @@ int main(int argc, char *argv[])
if (Keypressed(input, Key.Up) || Keypressed(input, Key.Down) || Keypressed(input, Key.PageUp) || Keypressed(input, Key.PageDown) || Keypressed(input, Key.Home) || Keypressed(input, Key.End) || Keypressed(input, Key.FindForward) || Keypressed(input, Key.FindBackward) || Keypressed(input, Key.NextFoundPosition) || Keypressed(input, Key.PrevFoundPosition)) if (Keypressed(input, Key.Up) || Keypressed(input, Key.Down) || Keypressed(input, Key.PageUp) || Keypressed(input, Key.PageDown) || Keypressed(input, Key.Home) || Keypressed(input, Key.End) || Keypressed(input, Key.FindForward) || Keypressed(input, Key.FindBackward) || Keypressed(input, Key.NextFoundPosition) || Keypressed(input, Key.PrevFoundPosition))
{ {
if (wCurrent == mLibArtists) if (wCurrent == mLibArtists)
{
mLibAlbums->Clear(0); mLibAlbums->Clear(0);
mLibSongs->Clear(0);
}
else if (wCurrent == mLibAlbums) else if (wCurrent == mLibAlbums)
mLibSongs->Clear(0); mLibSongs->Clear(0);
} }
@@ -1190,7 +1193,10 @@ int main(int argc, char *argv[])
{ {
wCurrent->Go(wDown); wCurrent->Go(wDown);
if (wCurrent == mLibArtists) if (wCurrent == mLibArtists)
{
mLibAlbums->Clear(0); mLibAlbums->Clear(0);
mLibSongs->Clear(0);
}
else if (wCurrent == mLibAlbums) else if (wCurrent == mLibAlbums)
mLibSongs->Clear(0); mLibSongs->Clear(0);
} }