Fix some issues that happened if we tried to play while already playing.

diff --git a/player.cpp b/player.cpp
index 5687673d614d1465352598f3f6cb995717776ee7..fa4ea47d8615f72fcf48c7f863865f6760eba4f4 100644 (file)
--- a/player.cpp
+++ b/player.cpp
@@ -54,6 +54,7 @@ void Player::thread_func(bool also_output_to_stream)
        double next_clip_fade_time = -1.0;
 
        for ( ;; ) {
+wait_for_clip:
                bool clip_ready;
                steady_clock::time_point before_sleep = steady_clock::now();
 
@@ -185,7 +186,9 @@ got_clip:
                                new_clip_changed.wait_until(lock, next_frame_start, [this]{
                                        return new_clip_ready || override_stream_idx != -1;
                                });
-                               if (new_clip_ready) break;
+                               if (new_clip_ready) {
+                                       goto wait_for_clip;
+                               }
                                if (override_stream_idx != -1) {
                                        stream_idx = override_stream_idx;
                                        override_stream_idx = -1;