From: Max Kellermann <max@duempel.org>
Date: Mon, 1 Dec 2008 16:48:13 +0000 (+0100)
Subject: screen_play: fix scrolling in auto-center mode
X-Git-Tag: release-0.12~19
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5ed77879a124224cf5a97dfd095506a2d3e74278;p=ncmpc.git

screen_play: fix scrolling in auto-center mode

Commit cfad0fdf enabled horizontal scrolling, but broke auto-center
mode: regardless of whether the current song has changed, it
re-centered the list.  Moved the options.scroll check to another "if"
branch.
---

diff --git a/src/screen_play.c b/src/screen_play.c
index 5acde45..7b94b80 100644
--- a/src/screen_play.c
+++ b/src/screen_play.c
@@ -472,11 +472,7 @@ play_update(mpdclient_t *c)
 	current_song_id = c->song != NULL && c->status != NULL &&
 		!IS_STOPPED(c->status->state) ? c->song->id : -1;
 
-	if (current_song_id != prev_song_id
-#ifndef NCMPC_MINI
-	     || options.scroll
-#endif
-	    ) {
+	if (current_song_id != prev_song_id) {
 		prev_song_id = current_song_id;
 
 		/* center the cursor */
@@ -484,6 +480,12 @@ play_update(mpdclient_t *c)
 			center_playing_item(c);
 
 		playlist_repaint();
+#ifndef NCMPC_MINI
+	} else if (options.scroll) {
+		/* always repaint if horizontal scrolling is
+		   enabled */
+		playlist_repaint();
+#endif
 	}
 }