From e8c8e6394ec2fca9b9b11d954c74dc0da52edc87 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Thu, 30 Sep 2010 05:15:25 +0200
Subject: [PATCH] lyrics: fix segfault if song didn't have proper tags set

---
 src/lyrics.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/lyrics.cpp b/src/lyrics.cpp
index d3ad50a0..7faf0b2c 100644
--- 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!");
 	}
 }