X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.cpp;h=6a8612f86e43be0f0f2e1740edd31a0c53ec61d9;hb=8e88294902b4b6f43c8db83dbf04830b5b9d2bfd;hp=cebc317801c4588f81170dcf02b82b0c8cbe167f;hpb=0403c737e76f127d046fcdf9eec7b2e3258833d8;p=nageru

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index cebc317..6a8612f 100644
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -194,7 +194,6 @@ void Player::play_playlist_once()
 			{
 				lock_guard<mutex> lock(queue_state_mu);
 				if (splice_ready) {
-					fprintf(stderr, "splicing\n");
 					if (next_clip == nullptr) {
 						do_splice(to_splice_clip_list, clip_idx, -1, &clip_list);
 					} else {
@@ -506,11 +505,12 @@ Player::Player(JPEGFrameView *destination, Player::StreamOutput stream_output, A
 Player::~Player()
 {
 	should_quit = true;
+	new_clip_changed.notify_all();
+	player_thread.join();
+
 	if (video_stream != nullptr) {
 		video_stream->stop();
 	}
-	new_clip_changed.notify_all();
-	player_thread.join();
 }
 
 void Player::play(const vector<ClipWithID> &clips)