playlist_control: don't resume playback when seeking to another song while paused

Use a shortcut in playlist_seek_song(), don't call playlist_play_order() because that would reset the "paused" state.

playlist_control: don't resume playback when seeking to another song while paused
d7d717f2 · Max Kellermann · d1eeed6a · d7d717f2 · d7d717f2
Commit d7d717f2 authored Jul 20, 2011 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

NEWS NEWS +1 -0

playlist_control.c src/playlist_control.c +5 -3

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.16.4 (2011/??/??)
 * fix memory leaks
+* don't resume playback when seeking to another song while paused
 * decoder:
  - ffmpeg: workaround for semantic API change in recent ffmpeg versions
  - flac: validate the sample rate when scanning the tag

--- a/src/playlist_control.c
+++ b/src/playlist_control.c
@@ -222,10 +222,12 @@ playlist_seek_song(struct playlist *playlist, unsigned song, float seek_time)
 	playlist->error_count = 0;

 	if (!playlist->playing || (unsigned)playlist->current != i) {
-		/* seeking is not within the current song - first
-		   start playing the new song */
+		/* seeking is not within the current song - prepare
+		   song change */
+
+		playlist->playing = true;
+		playlist->current = i;

-		playlist_play_order(playlist, i);
 		queued = NULL;
 	}