diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-03-16 22:25:57 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-03-16 22:25:57 +0000 |
| commit | 1b0b9e4b951e305d47bb011fc4e198472bb3fecf (patch) | |
| tree | 715db098b0a716a0ee3d46aa060fecadcffc1766 /src/wx/config_dialog.cc | |
| parent | c416bee48d5a5829077c844c5f2b802bf13ab4cd (diff) | |
Hand-apply 33b76b675d747fd828aba91d9d857227cb8a8244 from master; make sure signals are disconnected in the right places.
Diffstat (limited to 'src/wx/config_dialog.cc')
| -rw-r--r-- | src/wx/config_dialog.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 368a94636..c79c21dd1 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -362,7 +362,7 @@ public: _issuer->SetValue (std_to_wx (config->dcp_issuer ())); _issuer->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DefaultsPage::issuer_changed, this)); - config->Changed.connect (boost::bind (&DefaultsPage::config_changed, this)); + _config_connection = config->Changed.connect (boost::bind (&DefaultsPage::config_changed, this)); return panel; } @@ -430,6 +430,8 @@ private: wxChoice* _container; wxChoice* _dcp_content_type; wxTextCtrl* _issuer; + + boost::signals2::scoped_connection _config_connection; }; class EncodingServersPage : public wxPreferencesPage, public Page |