diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-01 21:02:19 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-01 21:02:19 +0100 |
| commit | 32790bbf7feaa4aa9b898706622ce4d8661fa54f (patch) | |
| tree | a00ad79f6a0bfbb4871760c6c538597af098c93e | |
| parent | 4ca2fcc360bbae05e896590fd53327616f9bd2a5 (diff) | |
Fix aff/666: thumbnail scan is run twice when changing the content file of a film.
| -rw-r--r-- | .be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/666e8ba3-f1a3-4245-9d00-9a3a5e048ed9/values | 2 | ||||
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 6 |
3 files changed, 11 insertions, 2 deletions
diff --git a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/666e8ba3-f1a3-4245-9d00-9a3a5e048ed9/values b/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/666e8ba3-f1a3-4245-9d00-9a3a5e048ed9/values index 8861f1d19..26a0240ff 100644 --- a/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/666e8ba3-f1a3-4245-9d00-9a3a5e048ed9/values +++ b/.be/aff5ca2c-44ee-4ed6-800b-4abe9c3e794c/bugs/666e8ba3-f1a3-4245-9d00-9a3a5e048ed9/values @@ -7,7 +7,7 @@ reporter: Carl Hetherington <cth@carlh.net> severity: minor -status: open +status: fixed summary: Re-setting content file runs thumb scan twice? @@ -1,3 +1,8 @@ +2012-10-01 Carl Hetherington <cth@carlh.net> + + * Fix aff/666: thumbnail scan is run twice + when changing the content file for a film. + 2012-09-28 Carl Hetherington <cth@carlh.net> * Fix crash bug which seems to have been diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 0d17baf83..e647a5886 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -171,7 +171,7 @@ END_EVENT_TABLE () FilmViewer::FilmViewer (Film* f, wxWindow* p) : wxPanel (p) - , _film (f) + , _film (0) { _sizer = new wxBoxSizer (wxVERTICAL); SetSizer (_sizer); @@ -232,6 +232,10 @@ FilmViewer::film_changed (Film::Property p) void FilmViewer::set_film (Film* f) { + if (_film == f) { + return; + } + _film = f; _thumb_panel->set_film (_film); |