Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --git a/ChangeLog b/ChangeLog
index 778b2067f487745c74d5bbb5f2f24d668e6f5c97..aeb563d52e5aab821689804a42737867f2374d02 100644 (file)
--- 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 22275a8bd9453469e5ddfdb406ee9f7dfabec5e8..4cb7d9714fa1b5dc2ac4cd4d86b426a1c6e3b5b7 100644 (file)
--- 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 ebe8032581df5af7363f237d0010da1b6aae6722..814dc596f628feee703d1b247a294b33ac757c39 100644 (file)
--- 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 150e9cb1678e5fb45418adff8220e0da26309baf..8f6c487eeb21a510188ffd4bd21514817415c984 100644 (file)
--- 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')