diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
| commit | 8c7a308c03e4b4196b4e2379a26d432b100ae2b1 (patch) | |
| tree | 605c8b62f56c5f9be2ff77161eb18ac372083a35 /src/wx/timing_panel.cc | |
| parent | 04acfa42cdffd5938358847ebee822399ef978e6 (diff) | |
| parent | a6d6a794b28c3b3e6679f01c1890f396453eb5ac (diff) | |
Merge master.
Diffstat (limited to 'src/wx/timing_panel.cc')
| -rw-r--r-- | src/wx/timing_panel.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index a0e1f8f8a..27d5b9cd3 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -166,9 +166,10 @@ TimingPanel::film_content_changed (int property) set<float> check; shared_ptr<VideoContent> vc; for (ContentList::const_iterator i = cl.begin (); i != cl.end(); ++i) { - vc = dynamic_pointer_cast<VideoContent> (*i); - if (vc) { - check.insert (vc->video_frame_rate ()); + shared_ptr<VideoContent> t = dynamic_pointer_cast<VideoContent> (*i); + if (t) { + check.insert (t->video_frame_rate ()); + vc = t; } } if (check.size() == 1) { |