projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
609dd23
)
Missing handling of CHANGE_TYPE_CANCELLED causing another hang.
v2.13.46
author
Carl Hetherington
<cth@carlh.net>
Wed, 29 Aug 2018 15:36:45 +0000
(16:36 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 29 Aug 2018 15:36:45 +0000
(16:36 +0100)
src/lib/player.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 5202bbbe0ff190f6d0a8f4cf682eb1d522a8eb63..b939995ef7bbaa7c5fdc6953be645da0fe803295 100644
(file)
--- 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);