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

16 years ago · e8c8e6394e
parent d2f8bb1e9d
commit e8c8e6394e
1 changed files with 7 additions and 5 deletions
--- a/src/lyrics.cpp
+++ b/src/lyrics.cpp
@ -110,18 +110,20 @@ void Lyrics::SwitchTo()
 #	endif // HAVE_CURL_CURL_H
 	
 	if (const MPD::Song *s = myScreen->CurrentSong())
+	{
+		if (!s->GetArtist().empty() && !s->GetTitle().empty())
 		{
 			myOldScreen = myScreen;
 			myScreen = this;
 			
-		if (!s->GetArtist().empty() && !s->GetTitle().empty())
-		{
 			itsSong = *s;
 			Load();
-		}
 			
 			Global::RedrawHeader = 1;
 		}
+		else
+			ShowMessage("Song must have both artist and title tag set!");
+	}
 }

 std::basic_string<my_char_t> Lyrics::Title()