Merge branch 'master' into static

Conflicts:
	configure.ac

1 files changed, 3 insertions, 1 deletions

diff --git a/main.c b/main.c
index 4552e00f..890b1c77 100644
--- a/main.c
+++ b/main.c
@@ -512,9 +512,11 @@ restore_resume_state (void) {
         int paused = conf_get_int ("resume.paused", 0);
         trace ("resume: track %d pos %f playlist %d\n", track, pos, plt);
         if (plt >= 0 && track >= 0 && pos >= 0) {
+            streamer_lock (); // need to hold streamer thread to make the resume operation atomic
             streamer_set_current_playlist (plt);
-            streamer_set_seek (pos);
             streamer_set_nextsong (track, paused ? 2 : 3);
+            streamer_set_seek (pos);
+            streamer_unlock ();
         }
     }
 }