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

2018-07-26 01:45:24 +01:00
parent 3422aadc70 dcde4bd46c
commit 48eba124bd
5 changed files with 37 additions and 5 deletions
@@ -909,7 +909,12 @@ bool Timeline::snap_to_point(long point, long* l) {
 void Timeline::snap_to_clip(long* l, bool playhead_inclusive) {
    snapped = false;
    if (snapping) {
-        if (!playhead_inclusive || !snap_to_point(playhead, l)) {
+        if (playhead_inclusive && !playing) {
+            playhead_inclusive = snap_to_point(playhead, l);
+        } else {
+            playhead_inclusive = false;
+        }
+        if (!playhead_inclusive) {
            for (int i=0;i<sequence->clip_count();i++) {
                Clip* c = sequence->get_clip(i);
                if (c != NULL) {