player_command: implement setup_seek() without a song object

[ncmpc.git] / src / screen.c

diff --git a/src/screen.c b/src/screen.c
index 5d6e4091698cc70b61635b7fbdaab4dfe945f58d..d3a826523b548380a9638d539113d31d764ebc38 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -158,12 +158,12 @@ update_progress_window(struct mpdclient *c, bool repaint)
 {
        unsigned elapsed, duration;
 
-       if (c->song != NULL && seek_id == (int)mpd_song_get_id(c->song))
+       if (c->status == NULL)
+               elapsed = 0;
+       else if (seek_id >= 0 && seek_id == mpd_status_get_song_id(c->status))
                elapsed = seek_target_time;
-       else if (c->status != NULL)
-               elapsed = mpd_status_get_elapsed_time(c->status);
        else
-               elapsed = 0;
+               elapsed = mpd_status_get_elapsed_time(c->status);
 
        duration = mpdclient_is_playing(c)
                ? mpd_status_get_total_time(c->status)