diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-10 20:38:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-10 20:38:28 +0100 |
| commit | 8d58a7c5f4320ad5c111e336c45e44d6b51ab509 (patch) | |
| tree | 9db468c1c7fc8bb960c382ba39e5d3b292745254 /src | |
| parent | 669db59c74217a2ccb6a77d02558907c3e1705a9 (diff) | |
| parent | 46f9949259a5402267d1f2809101b4f8c371dc70 (diff) | |
Merge master.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/playlist.cc | 1 | ||||
| -rw-r--r-- | src/wx/config_dialog.cc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 1c65d1326..16c740943 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -393,7 +393,6 @@ Playlist::move_later (shared_ptr<Content> c) return; } - DCPTime const p = (*next)->position (); (*next)->set_position (c->position ()); c->set_position (c->position() + c->length_after_trim ()); sort (_content.begin(), _content.end(), ContentSorter ()); diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index b25b470c1..fc77b42a2 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -697,7 +697,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; |