diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-10 13:04:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-10 13:04:59 +0100 |
| commit | d382f34db155ddaf4bb61538c18b87c7564e00b2 (patch) | |
| tree | 8c63943ad046240f9a307c640d022af750b07bb7 /src/wx | |
| parent | b5828ccf20a0e0c4365854ac19a05d5a4783e254 (diff) | |
| parent | 1bbd5367ddddfac18ceaa4d010cfc39f1daaa3a3 (diff) | |
Merge branch 'master' into subs
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_viewer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 3c7d76bce..6ffe4e66a 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -266,7 +266,7 @@ FilmViewer::update_thumbs () o->decode_audio = false; o->decode_video_frequency = 128; - shared_ptr<Job> j (new ThumbsJob (s, o, _film->log ())); + shared_ptr<Job> j (new ThumbsJob (s, o, _film->log(), shared_ptr<Job> ())); j->Finished.connect (sigc::mem_fun (_film, &Film::update_thumbs_post_gui)); JobManager::instance()->add (j); } |