From: Carl Hetherington <cth@carlh.net>
Date: Thu, 10 Jul 2014 14:57:48 +0000 (+0100)
Subject: Hopefully fix KDM email corruption.
X-Git-Tag: v2.0.48~655^2~45
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=3408efe149c709213d67e6a8583507d9e3b0d6ee

Hopefully fix KDM email corruption.

Reported-by: Carsten Kurz
---

diff --git a/ChangeLog b/ChangeLog
index acf6b55a1..e72598bbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-10  Carl Hetherington  <cth@carlh.net>
+
+	* Try to fix corruption of KDM email setting in
+	some cases.
+
 2014-07-08  Carl Hetherington  <cth@carlh.net>
 
 	* Fix various problems with seek and content
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 086e1be4e..ff2588253 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -696,7 +696,7 @@ public:
 		_kdm_cc->SetValue (std_to_wx (config->kdm_cc ()));
 		_kdm_cc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_cc_changed, this));
 		_kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_email_changed, this));
-		_kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ()));
+		_kdm_email->SetValue (std_to_wx (Config::instance()->kdm_email ()));
 		_reset_kdm_email->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMEmailPage::reset_kdm_email, this));
 
 		return panel;