Hopefully fix KDM email corruption.

Reported-by: Carsten Kurz

diff --git a/ChangeLog b/ChangeLog
index acf6b55a1ea2f2b4ac9161484b2127ab71644632..e72598bbe614dd427833e825350c90344ff4cf89 100644 (file)
--- 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 086e1be4ec7e85ab8ef8f0888780cea4aec0f6f6..ff25882539019ad89a351e1b564c5cf218314772 100644 (file)
--- 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;