From: Carl Hetherington Date: Mon, 1 Jul 2019 14:17:11 +0000 (+0100) Subject: swaroop: fix decrementing of allowed shows count to be at the right time. X-Git-Tag: v2.15.9~1 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=106bde1d2c9246fc62c8f37f560701abf0e80c51;p=dcpomatic.git swaroop: fix decrementing of allowed shows count to be at the right time. --- diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc index 99b1fd064..925fcb5e7 100644 --- a/src/wx/swaroop_controls.cc +++ b/src/wx/swaroop_controls.cc @@ -567,6 +567,7 @@ SwaroopControls::update_current_content () reset_film (); } +/** One piece of content in our SPL has finished playing */ void SwaroopControls::viewer_finished () { @@ -578,16 +579,17 @@ SwaroopControls::viewer_finished () _selected_playlist_position++; if (_selected_playlist_position < int(_playlists[*_selected_playlist].get().size())) { + /* Next piece of content on the SPL */ update_current_content (); if (!stop) { _viewer->start (); } } else { + /* Finished the whole SPL */ _selected_playlist_position = 0; _viewer->set_background_image (true); ResetFilm (shared_ptr(new Film(optional()))); stopped (); + decrement_allowed_shows (); } - - decrement_allowed_shows (); }