Merge branch 'master' of https://github.com/olive-editor/olive

2018-11-19 11:17:13 +11:00
parent 21fab10999 c4e06d902e
commit ca03252742
6 changed files with 31 additions and 13 deletions
@@ -1347,7 +1347,7 @@ void TimelineWidget::update_ghosts(const QPoint& mouse_pos, bool lock_frame) {
    }

    // apply changes to selections
-    if (panel_timeline->tool != TIMELINE_TOOL_SLIP && !panel_timeline->importing) {
+    if (panel_timeline->tool != TIMELINE_TOOL_SLIP && !panel_timeline->importing && !panel_timeline->creating) {
 		for (int i=0;i<sequence->selections.size();i++) {
 			Selection& s = sequence->selections[i];
            if (panel_timeline->trim_target > -1) {