diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-28 23:49:56 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-28 23:49:56 +0000 |
| commit | 4014143952f791973d94c5cfb5bec9e97d1462b7 (patch) | |
| tree | b6abe43ed1b7452d65e12accc5b358c3b58cdbcd /src/wx/timeline.cc | |
| parent | 5c6292315aa7c31a076e8ace513f62e062440a33 (diff) | |
ContentMenu was keeping its initial film and not using the current one; should fix #255.
Diffstat (limited to 'src/wx/timeline.cc')
| -rw-r--r-- | src/wx/timeline.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 0ac9a1d4b..6cc1f79d9 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -336,7 +336,7 @@ Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> film) , _left_down (false) , _down_view_position (0) , _first_move (false) - , _menu (film, this) + , _menu (this) , _snap (true) { #ifndef __WXOSX__ @@ -574,7 +574,7 @@ Timeline::right_down (wxMouseEvent& ev) cv->set_selected (true); } - _menu.popup (selected_content (), ev.GetPosition ()); + _menu.popup (_film, selected_content (), ev.GetPosition ()); } void |