diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-12-18 22:06:33 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-12-18 22:06:33 +0000 |
| commit | fe33a32911969530aed75bc2a87b7a7cd2c05be6 (patch) | |
| tree | 4f0fdeca6b632ffc2874775d633286f14dcf7fa6 /src | |
| parent | 396a6e373751ff347be8497607d0a3248e5c61e4 (diff) | |
swaroop: respect skippable/timeline disable even with first piece of content.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/swaroop_controls.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc index 6e3d052eb..e02c38749 100644 --- a/src/wx/swaroop_controls.cc +++ b/src/wx/swaroop_controls.cc @@ -335,6 +335,7 @@ SwaroopControls::spl_selection_changed () _selected_playlist = selected; _selected_playlist_position = 0; reset_film (); + update_current_content (); } void @@ -370,7 +371,7 @@ SwaroopControls::update_current_content () { DCPOMATIC_ASSERT (_selected_playlist); - _viewer->stop (); + bool const was_playing = _viewer->stop (); SPLEntry const & e = _playlists[*_selected_playlist].get()[_selected_playlist_position]; _current_disable_timeline = e.disable_timeline; @@ -378,7 +379,9 @@ SwaroopControls::update_current_content () setup_sensitivity (); reset_film (); - _viewer->start (); + if (was_playing) { + _viewer->start (); + } } void |