diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-11 12:04:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-11 12:04:27 +0000 |
| commit | 8aeb741ccbe2edb528e98a431bf55459a6836a9b (patch) | |
| tree | a14569b531d9867683a1ac1c94c8e0eb406906a8 /src/wx/timeline.cc | |
| parent | 4ba8772aef261da209bbb882325fd61a8b479fd7 (diff) | |
| parent | 22f2cd94132f93a159c2ce9fe263771cb5a5dbdf (diff) | |
Merge master.
Diffstat (limited to 'src/wx/timeline.cc')
| -rw-r--r-- | src/wx/timeline.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 2119e7813..ac26c77a9 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -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; } |