From: Carl Hetherington Date: Wed, 29 Aug 2018 15:36:45 +0000 (+0100) Subject: Missing handling of CHANGE_TYPE_CANCELLED causing another hang. X-Git-Tag: v2.13.46^0 X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e4dc7972ec35d891287598f33a1b4e1461ddc3fc Missing handling of CHANGE_TYPE_CANCELLED causing another hang. --- diff --git a/src/lib/player.cc b/src/lib/player.cc index 5202bbbe0..b939995ef 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -237,6 +237,8 @@ Player::playlist_content_change (ChangeType type, int property, bool frequent) } else if (type == CHANGE_TYPE_DONE) { /* A change in our content has gone through. Re-build our pieces. */ setup_pieces (); + } else if (type == CHANGE_TYPE_CANCELLED) { + _suspended = false; } Change (type, property, frequent);