summaryrefslogtreecommitdiff
path: root/src/wx/hints_dialog.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-08-19 13:55:46 +0100
committerCarl Hetherington <cth@carlh.net>2018-08-19 13:55:46 +0100
commit4408e6eea87ce9630e71e4a7d40e2dade091b0ee (patch)
tree634dd286de7ee2b18cbdc6bcb8837b52b2f8655f /src/wx/hints_dialog.cc
parent67c604d3fa2391b98ea436e2c6412f1c83a98f77 (diff)
Similar pending/done for Film::Change.
Diffstat (limited to 'src/wx/hints_dialog.cc')
-rw-r--r--src/wx/hints_dialog.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index 3872ea8ae..cbd48ec36 100644
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -75,8 +75,8 @@ HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film, bool ok)
boost::shared_ptr<Film> locked_film = _film.lock ();
if (locked_film) {
- _film_changed_connection = locked_film->Changed.connect (boost::bind (&HintsDialog::film_changed, this));
- _film_content_changed_connection = locked_film->ContentChange.connect (boost::bind (&HintsDialog::film_content_change, this, _1));
+ _film_change_connection = locked_film->Change.connect (boost::bind (&HintsDialog::film_change, this, _1));
+ _film_content_change_connection = locked_film->ContentChange.connect (boost::bind (&HintsDialog::film_content_change, this, _1));
}
_hints->Hint.connect (bind (&HintsDialog::hint, this, _1));
@@ -84,12 +84,16 @@ HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> film, bool ok)
_hints->Pulse.connect (bind (&HintsDialog::pulse, this));
_hints->Finished.connect (bind (&HintsDialog::finished, this));
- film_changed ();
+ film_change (CHANGE_TYPE_DONE);
}
void
-HintsDialog::film_changed ()
+HintsDialog::film_change (ChangeType type)
{
+ if (type != CHANGE_TYPE_DONE) {
+ return;
+ }
+
_text->Clear ();
_current.clear ();
@@ -109,9 +113,7 @@ HintsDialog::film_changed ()
void
HintsDialog::film_content_change (ChangeType type)
{
- if (type == CHANGE_TYPE_DONE) {
- film_changed ();
- }
+ film_change (type);
}
void