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

4 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index eeb57f1fe..a0856e8e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-09-17  Carl Hetherington  <cth@carlh.net>
 
+	* Version 2.3.4 released.
+
+2015-09-17  Carl Hetherington  <cth@carlh.net>
+
 	* Version 2.3.3 released.
 
 2015-09-16  Carl Hetherington  <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index b2ae0b706..22275a8bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.3.3-1) UNRELEASED; urgency=low
+dcpomatic (2.3.4-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -310,8 +310,9 @@ dcpomatic (2.3.3-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 17 Sep 2015 00:09:59 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 17 Sep 2015 20:49:11 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc
index d2f0e4c11..bd5c5f636 100644
--- a/src/wx/subtitle_panel.cc
+++ b/src/wx/subtitle_panel.cc
@@ -255,6 +255,9 @@ SubtitlePanel::setup_sensitivity ()
 	_stream->Enable (!reference && ffmpeg_subs == 1);
 	_subtitle_view_button->Enable (!reference && subrip_or_dcp_subs == 1);
 	_fonts_dialog_button->Enable (!reference && subrip_or_dcp_subs == 1);
+
+	ContentList sel = _parent->selected ();
+	_reference->Enable (sel.size() == 1 && dynamic_pointer_cast<DCPContent> (sel.front ()));
 }
 
 void
diff --git a/wscript b/wscript
index 9ea6aca31..3e84dcac5 100644
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs
 
 APPNAME = 'dcpomatic'
-VERSION = '2.3.3devel'
+VERSION = '2.3.4devel'
 
 def options(opt):
     opt.load('compiler_cxx')