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/content_colour_conversion_dialog.cc | |
| parent | c416bee48d5a5829077c844c5f2b802bf13ab4cd (diff) | |
Hand-apply 33b76b675d747fd828aba91d9d857227cb8a8244 from master; make sure signals are disconnected in the right places.
Diffstat (limited to 'src/wx/content_colour_conversion_dialog.cc')
| -rw-r--r-- | src/wx/content_colour_conversion_dialog.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc index 3fa8e120a..500a168f5 100644 --- a/src/wx/content_colour_conversion_dialog.cc +++ b/src/wx/content_colour_conversion_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -59,7 +59,7 @@ ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent) _preset_check->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ContentColourConversionDialog::preset_check_clicked, this)); _preset_choice->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&ContentColourConversionDialog::preset_choice_changed, this)); - _editor->Changed.connect (boost::bind (&ContentColourConversionDialog::check_for_preset, this)); + _editor_connection = _editor->Changed.connect (boost::bind (&ContentColourConversionDialog::check_for_preset, this)); vector<PresetColourConversion> presets = Config::instance()->colour_conversions (); for (vector<PresetColourConversion>::const_iterator i = presets.begin(); i != presets.end(); ++i) { |