projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2.0--libdcp-1.0
[dcpomatic.git]
/
src
/
wx
/
timeline.cc
diff --git
a/src/wx/timeline.cc
b/src/wx/timeline.cc
index 9d2aee76c00f7660d424a5ef9c5275e5514a1cd2..ac26c77a9125d7ab31c2a34620831d980b5d6bc4 100644
(file)
--- a/
src/wx/timeline.cc
+++ b/
src/wx/timeline.cc
@@
-336,7
+336,7
@@
DCPTimeline::DCPTimeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> fil
, _left_down (false)
, _down_view_position (0)
, _first_move (false)
, _left_down (false)
, _down_view_position (0)
, _first_move (false)
- , _menu (
film,
this)
+ , _menu (this)
, _snap (true)
{
#ifndef __WXOSX__
, _snap (true)
{
#ifndef __WXOSX__
@@
-474,7
+474,7
@@
void
DCPTimeline::setup_pixels_per_time_unit ()
{
shared_ptr<const Film> film = _film.lock ();
DCPTimeline::setup_pixels_per_time_unit ()
{
shared_ptr<const Film> film = _film.lock ();
- if (!film) {
+ if (!film
|| film->length() == 0
) {
return;
}
return;
}
@@
-574,7
+574,7
@@
DCPTimeline::right_down (wxMouseEvent& ev)
cv->set_selected (true);
}
cv->set_selected (true);
}
- _menu.popup (selected_content (), ev.GetPosition ());
+ _menu.popup (
_film,
selected_content (), ev.GetPosition ());
}
void
}
void