summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--debian/changelog5
-rw-r--r--src/wx/audio_dialog.cc2
-rw-r--r--wscript2
4 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 778b2067f..aeb563d52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-09-21 Carl Hetherington <cth@carlh.net>
+
+ * Version 2.3.5 released.
+
2015-09-20 Carl Hetherington <cth@carlh.net>
* Fix setting of frame rate when loading
diff --git a/debian/changelog b/debian/changelog
index 22275a8bd..4cb7d9714 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.3.4-1) UNRELEASED; urgency=low
+dcpomatic (2.3.5-1) UNRELEASED; urgency=low
[ Carl Hetherington ]
* New upstream release.
@@ -311,8 +311,9 @@ dcpomatic (2.3.4-1) UNRELEASED; urgency=low
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
- -- Carl Hetherington <carl@d1stkfactory> Thu, 17 Sep 2015 20:49:11 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Mon, 21 Sep 2015 12:26:01 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index ebe803258..814dc596f 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -217,7 +217,7 @@ AudioDialog::content_changed (int p)
if (p == AudioContentProperty::AUDIO_STREAMS) {
try_to_load_analysis ();
} else if (p == AudioContentProperty::AUDIO_GAIN) {
- if (_playlist->content().size() == 1) {
+ if (_playlist->content().size() == 1 && _analysis) {
/* We can use a short-cut to render the effect of this
change, rather than recalculating everything.
*/
diff --git a/wscript b/wscript
index 150e9cb16..8f6c487ee 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
from waflib import Logs
APPNAME = 'dcpomatic'
-VERSION = '2.3.4devel'
+VERSION = '2.3.5devel'
def options(opt):
opt.load('compiler_cxx')