From 765f90586c498860aa687e2b0cd6cedf1e0b1bf0 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 1 Oct 2015 15:04:05 +0100
Subject: Fix erroneous optional dereference.

---
 src/lib/config.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/config.cc b/src/lib/config.cc
index a51c775a3..64d794b36 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -232,7 +232,7 @@ Config::read ()
 	_check_for_test_updates = f.optional_bool_child("CheckForTestUpdates").get_value_or (false);
 
 	_maximum_j2k_bandwidth = f.optional_number_child<int> ("MaximumJ2KBandwidth").get_value_or (250000000);
-	_allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate");
+	_allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate").get_value_or (false);
 
 	_log_types = f.optional_number_child<int> ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR);
 	_automatic_audio_analysis = f.optional_bool_child ("AutomaticAudioAnalysis").get_value_or (false);
-- 
cgit v1.2.3


From 85fa5c482d005ea8b53d3dce54a8f15b237deb14 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 1 Oct 2015 16:00:30 +0100
Subject: Explicit casts optional to bool.

---
 src/wx/config_dialog.cc                    | 2 +-
 src/wx/content_colour_conversion_dialog.cc | 6 ++----
 src/wx/screen_dialog.cc                    | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 5b02d71e3..dcafee4ca 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -227,7 +227,7 @@ private:
 	{
 		Config* config = Config::instance ();
 
-		checked_set (_set_language, config->language ());
+		checked_set (_set_language, static_cast<bool>(config->language()));
 
 		if (config->language().get_value_or ("") == "fr") {
 			checked_set (_language, 3);
diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index 9713cde1b..e4e16157d 100644
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -93,8 +93,8 @@ ContentColourConversionDialog::check_for_preset ()
 
 	optional<size_t> preset = _editor->get().preset ();
 
-	_preset_check->SetValue (preset);
-	_preset_choice->Enable (preset);
+	_preset_check->SetValue (static_cast<bool>(preset));
+	_preset_choice->Enable (static_cast<bool>(preset));
 	if (preset) {
 		_preset_choice->SetSelection (preset.get ());
 	} else {
@@ -123,5 +123,3 @@ ContentColourConversionDialog::preset_choice_changed ()
 		set (presets[s].conversion);
 	}
 }
-
-
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 66e37a4cf..13dd9f42f 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -130,7 +130,7 @@ ScreenDialog::setup_sensitivity ()
 {
 	wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
 	if (ok) {
-		ok->Enable (_certificate);
+		ok->Enable (static_cast<bool>(_certificate));
 	}
 
 	_download_certificate->Enable (
-- 
cgit v1.2.3