swaroop: fix decrementing of allowed shows count to be at the right time.
authorCarl Hetherington <cth@carlh.net>
Mon, 1 Jul 2019 14:17:11 +0000 (15:17 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 1 Jul 2019 14:17:11 +0000 (15:17 +0100)
src/wx/swaroop_controls.cc

index 99b1fd0647531ae89c570f9e62c9338b354b2cf9..925fcb5e720961c7121ff604127399726b504470 100644 (file)
@@ -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<Film>(new Film(optional<boost::filesystem::path>())));
                stopped ();
+               decrement_allowed_shows ();
        }
-
-       decrement_allowed_shows ();
 }