From 220de6f9a931795a53486513dd8d3c9cb11d7c29 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 1 Dec 2018 20:59:23 +1100 Subject: [PATCH] fixed issue setting in/out on still images --- panels/timeline.cpp | 2 +- ui/timelineheader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panels/timeline.cpp b/panels/timeline.cpp index a62203c46..1caa80d2a 100644 --- a/panels/timeline.cpp +++ b/panels/timeline.cpp @@ -181,7 +181,7 @@ void Timeline::create_ghosts_from_media(Sequence* seq, long entry_point, QVector can_import = m->ready; if (m->using_inout) { double source_fr = 30; - if (m->video_tracks.size() > 0) source_fr = m->video_tracks.at(0)->video_frame_rate; + if (m->video_tracks.size() > 0 && !qIsNull(m->video_tracks.at(0)->video_frame_rate)) source_fr = m->video_tracks.at(0)->video_frame_rate; default_clip_in = refactor_frame_number(m->in, source_fr, seq->frame_rate); default_clip_out = refactor_frame_number(m->out, source_fr, seq->frame_rate); } diff --git a/ui/timelineheader.cpp b/ui/timelineheader.cpp index 8e05dd940..00094fac2 100644 --- a/ui/timelineheader.cpp +++ b/ui/timelineheader.cpp @@ -79,7 +79,7 @@ void TimelineHeader::set_out_point(long new_out) { long new_in = viewer->seq->workarea_in; if (new_out == new_in) { new_out++; - } else if (new_in > new_out) { + } else if (new_in > new_out || new_in < 0) { new_in = 0; }