X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_lyrics.c;h=a8c721068542563a57713d8c1503733b0e07fac5;hb=c64c37477b87ec545365b8923d6f9ff745469617;hp=e655fc5f37c1fcb53e2ce79d62b9c4be3aa0bb67;hpb=a69a33f49839d4977ab9d6168644f69ff4c65d4e;p=ncmpc.git

diff --git a/src/screen_lyrics.c b/src/screen_lyrics.c
index e655fc5..a8c7210 100644
--- a/src/screen_lyrics.c
+++ b/src/screen_lyrics.c
@@ -1,25 +1,25 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "screen_lyrics.h"
 #include "screen_interface.h"
-#include "screen_message.h"
+#include "screen_status.h"
 #include "screen_file.h"
 #include "screen_song.h"
 #include "i18n.h"
@@ -246,6 +246,17 @@ screen_lyrics_load(const struct mpd_song *song)
 	}
 }
 
+static void
+screen_lyrics_reload(void)
+{
+	if (current.loader == NULL && current.artist != NULL &&
+	    current.title != NULL) {
+		current.loader = lyrics_load(current.artist, current.title,
+					     screen_lyrics_callback, NULL);
+		screen_text_repaint(&text);
+	}
+}
+
 static void
 lyrics_screen_init(WINDOW *w, int cols, int rows)
 {
@@ -369,12 +380,7 @@ lyrics_cmd(struct mpdclient *c, command_t cmd)
 		}
 		return true;
 	case CMD_SELECT:
-		if (current.loader == NULL && current.artist != NULL &&
-		    current.title != NULL) {
-			current.loader = lyrics_load(current.artist, current.title,
-						     screen_lyrics_callback, NULL);
-			screen_text_repaint(&text);
-		}
+		screen_lyrics_reload();
 		return true;
 
 #ifdef ENABLE_SONG_SCREEN