lyrics: fix segfault if song didn't have proper tags set

2010-09-30 05:15:25 +02:00
parent d2f8bb1e9d
commit e8c8e6394e
1 changed files with 7 additions and 5 deletions
--- a/src/lyrics.cpp
+++ b/src/lyrics.cpp
@@ -111,16 +111,18 @@ void Lyrics::SwitchTo()
 	
 	if (const MPD::Song *s = myScreen->CurrentSong())
 	{
-		myOldScreen = myScreen;
-		myScreen = this;
-		
 		if (!s->GetArtist().empty() && !s->GetTitle().empty())
 		{
+			myOldScreen = myScreen;
+			myScreen = this;
+			
 			itsSong = *s;
 			Load();
-		}
 			
-		Global::RedrawHeader = 1;
+			Global::RedrawHeader = 1;
+		}
+		else
+			ShowMessage("Song must have both artist and title tag set!");
 	}
 }