Fix failure to restore "audio same fades as video" setting to the GUI (#2934).

3 files changed, 19 insertions, 0 deletions

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index bda0230ca..65f781a1e 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -442,6 +442,14 @@ AudioContent::fade_out () const
 }
 
 
+bool
+AudioContent::use_same_fades_as_video() const
+{
+	boost::mutex::scoped_lock lm (_mutex);
+	return _use_same_fades_as_video;
+}
+
+
 void
 AudioContent::set_fade_in (ContentTime t)
 {
diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 2a140b3e4..b21b2ab21 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -82,6 +82,7 @@ public:
 
 	dcpomatic::ContentTime fade_in () const;
 	dcpomatic::ContentTime fade_out () const;
+	bool use_same_fades_as_video() const;
 
 	void set_fade_in (dcpomatic::ContentTime time);
 	void set_fade_out (dcpomatic::ContentTime time);
diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 1d6cba315..1418f1ff9 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -277,6 +277,16 @@ AudioPanel::film_content_changed (int property)
 			_fade_out->clear ();
 		}
 	} else if (property == AudioContentProperty::USE_SAME_FADES_AS_VIDEO) {
+		set<bool> check;
+		for (auto i: ac) {
+			check.insert(i->audio->use_same_fades_as_video());
+		}
+
+		if (check.size() == 1) {
+			_use_same_fades_as_video->set(ac.front()->audio->use_same_fades_as_video());
+		} else {
+			_use_same_fades_as_video->set(false);
+		}
 		setup_sensitivity ();
 	}
 }