Fix setting of fade in/out on multiple pieces of content at the same time (#1934).

1 files changed, 6 insertions, 4 deletions

diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 6cb3bfc87..ce6b08f26 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -635,18 +635,20 @@ VideoPanel::setup_sensitivity ()
 void
 VideoPanel::fade_in_changed ()
 {
-	for (auto i: _parent->selected_video ()) {
+	auto const hmsf = _fade_in->get();
+	for (auto i: _parent->selected_video()) {
 		double const vfr = i->active_video_frame_rate (_parent->film());
-		i->video->set_fade_in (_fade_in->get(vfr).frames_round(vfr));
+		i->video->set_fade_in (dcpomatic::ContentTime(hmsf, vfr).frames_round(vfr));
 	}
 }
 
 void
 VideoPanel::fade_out_changed ()
 {
-	for (auto i: _parent->selected_video ()) {
+	auto const hmsf = _fade_out->get();
+	for (auto i: _parent->selected_video()) {
 		double const vfr = i->active_video_frame_rate (_parent->film());
-		i->video->set_fade_out (_fade_out->get(vfr).frames_round(vfr));
+		i->video->set_fade_out (dcpomatic::ContentTime(hmsf, vfr).frames_round(vfr));
 	}
 }