X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_panel.cc;h=0cb062efd3f2c4cc127b093c29f8df3b12b233f3;hb=77d2514fee2919c32e4db92b8f75369754d17fb5;hp=ba2a12e9fb6359a175172d403b3c911b4519caf9;hpb=0bab9b203ccd49c6d7a4536f1bbdb740f49ba65f;p=dcpomatic.git

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index ba2a12e9f..0cb062efd 100644
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -177,6 +177,10 @@ AudioPanel::~AudioPanel ()
 void
 AudioPanel::film_changed (Film::Property property)
 {
+	if (!_parent->film()) {
+		return;
+	}
+
 	switch (property) {
 	case Film::AUDIO_CHANNELS:
 	case Film::AUDIO_PROCESSOR:
@@ -247,18 +251,14 @@ AudioPanel::gain_calculate_button_clicked ()
 {
 	GainCalculatorDialog* d = new GainCalculatorDialog (this);
 	int const r = d->ShowModal ();
+	optional<float> c = d->db_change();
 
-	if (r == wxID_CANCEL || d->wanted_fader() == 0 || d->actual_fader() == 0) {
+	if (r == wxID_CANCEL || !c) {
 		d->Destroy ();
 		return;
 	}
 
-	_gain->wrapped()->SetValue (
-		Config::instance()->cinema_sound_processor()->db_for_fader_change (
-			d->wanted_fader (),
-			d->actual_fader ()
-			)
-		);
+	_gain->wrapped()->SetValue (*c);
 
 	/* This appears to be necessary, as the change is not signalled,
 	   I think.