From 21e926ddb62165eaf85c719545135a50e93a0e08 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 22 Aug 2018 23:08:59 +0100 Subject: [PATCH] Fix hang due to incorrect signal ordering. --- src/lib/player.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/player.cc b/src/lib/player.cc index 1e543fe1f..5dfc4e66d 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -98,7 +98,10 @@ Player::Player (shared_ptr film, shared_ptr playlist , _shuffler (0) { _film_changed_connection = _film->Change.connect (bind (&Player::film_change, this, _1, _2)); - _playlist_change_connection = _playlist->Change.connect (bind (&Player::playlist_change, this, _1)); + /* The butler must hear about this first, so since we are proxying this through to the butler we must + be first. + */ + _playlist_change_connection = _playlist->Change.connect (bind (&Player::playlist_change, this, _1), boost::signals2::at_front); _playlist_content_change_connection = _playlist->ContentChange.connect (bind(&Player::playlist_content_change, this, _1, _3, _4)); set_video_container_size (_film->frame_size ()); -- 2.30.2