X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=ac26c77a9125d7ab31c2a34620831d980b5d6bc4;hb=8aeb741ccbe2edb528e98a431bf55459a6836a9b;hp=9d2aee76c00f7660d424a5ef9c5275e5514a1cd2;hpb=a5b59faff75265d3256ad0dbd9f0c69e51e31ce4;p=dcpomatic.git

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 9d2aee76c..ac26c77a9 100644
--- 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)
-	, _menu (film, this)
+	, _menu (this)
 	, _snap (true)
 {
 #ifndef __WXOSX__
@@ -474,7 +474,7 @@ void
 DCPTimeline::setup_pixels_per_time_unit ()
 {
 	shared_ptr<const Film> film = _film.lock ();
-	if (!film) {
+	if (!film || film->length() == 0) {
 		return;
 	}
 
@@ -574,7 +574,7 @@ DCPTimeline::right_down (wxMouseEvent& ev)
 		cv->set_selected (true);
 	}
 
-	_menu.popup (selected_content (), ev.GetPosition ());
+	_menu.popup (_film, selected_content (), ev.GetPosition ());
 }
 
 void