Handle connections to the Hints object more correctly.

diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index db576da160865a887bbeefc91d29261db5c2e07e..2ab28fa6ca7d44b6b98d7d8c19b5a596577666ce 100644 (file)
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -117,10 +117,10 @@ HintsDialog::film_change (ChangeType type)
        _finished = false;
 
        _hints.reset (new Hints (_film));
-       _hints->Hint.connect (bind (&HintsDialog::hint, this, _1));
-       _hints->Progress.connect (bind (&HintsDialog::progress, this, _1));
-       _hints->Pulse.connect (bind (&HintsDialog::pulse, this));
-       _hints->Finished.connect (bind (&HintsDialog::finished, this));
+       _hints_hint_connection = _hints->Hint.connect(bind(&HintsDialog::hint, this, _1));
+       _hints_progress_connection = _hints->Progress.connect(bind(&HintsDialog::progress, this, _1));
+       _hints_pulse_connection = _hints->Pulse.connect(bind(&HintsDialog::pulse, this));
+       _hints_finished_connection = _hints->Finished.connect(bind(&HintsDialog::finished, this));
        _hints->start ();
 }
 

diff --git a/src/wx/hints_dialog.h b/src/wx/hints_dialog.h
index 9124d5c13e9e7fc9d95ab73d3d61bde698ab8889..37d36459cab6a734af0755f8e7bec4e9a6d463f3 100644 (file)
--- a/src/wx/hints_dialog.h
+++ b/src/wx/hints_dialog.h
@@ -56,4 +56,8 @@ private:
 
        boost::signals2::scoped_connection _film_change_connection;
        boost::signals2::scoped_connection _film_content_change_connection;
+       boost::signals2::scoped_connection _hints_hint_connection;
+       boost::signals2::scoped_connection _hints_progress_connection;
+       boost::signals2::scoped_connection _hints_pulse_connection;
+       boost::signals2::scoped_connection _hints_finished_connection;
 };