Fix strange default of user_explicit with set_video_frame_rate.

4 files changed, 5 insertions, 6 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 12ab7c8a2..41944677c 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1357,7 +1357,7 @@ Film::signal_change(ChangeType type, FilmProperty p)
 
 		if (p == FilmProperty::CONTENT) {
 			if (!_user_explicit_video_frame_rate) {
-				set_video_frame_rate(best_video_frame_rate());
+				set_video_frame_rate(best_video_frame_rate(), false);
 			}
 		}
 
diff --git a/src/lib/film.h b/src/lib/film.h
index 1bb60f9d5..5e3a6e0fe 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -404,7 +404,7 @@ public:
 	void set_encrypt_sound(bool);
 	void set_encrypt_text(bool);
 	void set_video_bit_rate(VideoEncoding encoding, int64_t);
-	void set_video_frame_rate(int rate, bool user_explicit = false);
+	void set_video_frame_rate(int rate, bool user_explicit = true);
 	void set_audio_channels(int);
 	void set_three_d(bool);
 	void set_isdcf_date_today();
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 853f46560..037fd3d72 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -518,7 +518,7 @@ public:
 			}
 
 			if (dcp->video_frame_rate()) {
-				_film->set_video_frame_rate(dcp->video_frame_rate().get(), true);
+				_film->set_video_frame_rate(dcp->video_frame_rate().get());
 			}
 
 			switch (dcp->video_encoding()) {
diff --git a/src/wx/dcp_panel.cc b/src/wx/dcp_panel.cc
index 96b4b3cb5..c61e8fea1 100644
--- a/src/wx/dcp_panel.cc
+++ b/src/wx/dcp_panel.cc
@@ -322,8 +322,7 @@ DCPPanel::frame_rate_choice_changed()
 	_film->set_video_frame_rate(
 		boost::lexical_cast<int>(
 			wx_to_std(_frame_rate_choice->GetString(*_frame_rate_choice->get()))
-			),
-		true
+			)
 		);
 }
 
@@ -762,7 +761,7 @@ DCPPanel::best_frame_rate_clicked()
 		return;
 	}
 
-	_film->set_video_frame_rate(_film->best_video_frame_rate());
+	_film->set_video_frame_rate(_film->best_video_frame_rate(), false);
 }