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/job_manager_view.cc | |
| parent | c416bee48d5a5829077c844c5f2b802bf13ab4cd (diff) | |
Hand-apply 33b76b675d747fd828aba91d9d857227cb8a8244 from master; make sure signals are disconnected in the right places.
Diffstat (limited to 'src/wx/job_manager_view.cc')
| -rw-r--r-- | src/wx/job_manager_view.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index 3593d2357..ec58607af 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -79,8 +79,8 @@ public: table->Insert (n, _details, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6); ++n; - job->Progress.connect (boost::bind (&JobRecord::progress, this)); - job->Finished.connect (boost::bind (&JobRecord::finished, this)); + _progress_connection = job->Progress.connect (boost::bind (&JobRecord::progress, this)); + _finished_connection = job->Finished.connect (boost::bind (&JobRecord::finished, this)); table->Layout (); panel->FitInside (); @@ -181,6 +181,9 @@ private: wxButton* _pause; wxButton* _details; std::string _last_name; + + boost::signals2::scoped_connection _progress_connection; + boost::signals2::scoped_connection _finished_connection; }; /** Must be called in the GUI thread */ |