From: Carl Hetherington <cth@carlh.net>
Date: Fri, 3 May 2019 22:10:29 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
X-Git-Tag: v2.14.1~6
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=bb4af4ee38488120090de1879ee43a27ba2d4537;hp=caa554d47f573d8f169d2bab9f4c19e761a9768b

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

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 7e7dd6fbd..f10815ca4 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -33,6 +33,8 @@
 #include "lib/audio_content.h"
 #include "lib/string_text_file_content.h"
 #include "lib/video_content.h"
+#include "lib/dcp_content.h"
+#include "lib/ffmpeg_content.h"
 #include <dcp/locale_convert.h>
 #include <boost/foreach.hpp>
 #include <set>
@@ -463,7 +465,22 @@ TimingPanel::play_length_changed ()
 void
 TimingPanel::video_frame_rate_changed ()
 {
-	_set_video_frame_rate->Enable (true);
+	bool enable = true;
+	if (_video_frame_rate->GetValue() == wxT("")) {
+		/* No frame rate has been entered; if the user clicks "set" now it would unset the video
+		   frame rate in the selected content.  This can't be allowed for some content types.
+		*/
+		BOOST_FOREACH (shared_ptr<Content> i, _parent->selected()) {
+			if (
+				dynamic_pointer_cast<DCPContent>(i) ||
+				dynamic_pointer_cast<FFmpegContent>(i)
+				) {
+				enable = false;
+			}
+		}
+	}
+
+	_set_video_frame_rate->Enable (enable);
 }
 
 void