diff --git a/olive.pro.user b/olive.pro.user index 6f7ea43fd..a1ff0c084 100644 --- a/olive.pro.user +++ b/olive.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/panels/timeline.cpp b/panels/timeline.cpp index 2dff352f6..37d6f6d7d 100644 --- a/panels/timeline.cpp +++ b/panels/timeline.cpp @@ -433,10 +433,12 @@ void Timeline::split_clip_and_relink(Clip* clip, long frame, bool relink) { // if alt is not down, split clips links too if (relink) { + bool original_clip_is_selected = is_clip_selected(clip); + // find linked clips of old clip for (int i=0;ilinked.size();i++) { Clip* link = sequence->get_clip(clip->linked.at(i)); - if (!panel_timeline->is_clip_selected(link)) { + if (original_clip_is_selected != !is_clip_selected(link)) { Clip* s = sequence->split_clip(link, frame); if (s != NULL) { pre_clips.append(link); diff --git a/ui/timelinewidget.cpp b/ui/timelinewidget.cpp index 2e9de8c66..175ac9b15 100644 --- a/ui/timelinewidget.cpp +++ b/ui/timelinewidget.cpp @@ -242,7 +242,9 @@ void TimelineWidget::mousePressEvent(QMouseEvent *event) { { if (clip_index >= 0) { Clip* clip = sequence->get_clip(clip_index); - if (clip != NULL) panel_timeline->split_clip_and_relink(clip, panel_timeline->drag_frame_start, !(event->modifiers() & Qt::AltModifier)); + if (clip != NULL) { + panel_timeline->split_clip_and_relink(clip, panel_timeline->drag_frame_start, !(event->modifiers() & Qt::AltModifier)); + } } panel_timeline->splitting = true; panel_timeline->redraw_all_clips(true);