From fc65b3c83173511e92239227c2d44e0d03d9ab6e Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Thu, 29 Nov 2018 12:44:50 +1100
Subject: [PATCH] fixed issue zooming into timeline while playing

---
 panels/timeline.cpp | 12 +++++++++---
 panels/timeline.h   |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/panels/timeline.cpp b/panels/timeline.cpp
index 71ae30183..e269dd095 100644
--- a/panels/timeline.cpp
+++ b/panels/timeline.cpp
@@ -45,6 +45,7 @@ Timeline::Timeline(QWidget *parent) :
     cursor_frame(0),
     cursor_track(0),
     zoom(1.0),
+    zoom_just_changed(false),
     showing_all(false),
     snapping(true),
     snapped(false),
@@ -430,7 +431,8 @@ void Timeline::repaint_timeline() {
 
     if (sequence != NULL
             && !ui->horizontalScrollBar->isSliderDown()
-            && panel_sequence_viewer->playing) {
+            && panel_sequence_viewer->playing
+            && !zoom_just_changed) {
         // auto scroll
         if (config.autoscroll == AUTOSCROLL_PAGE_SCROLL) {
             int playhead_x = panel_timeline->getTimelineScreenPointFromFrame(sequence->playhead);
@@ -445,6 +447,8 @@ void Timeline::repaint_timeline() {
         }
     }
 
+    zoom_just_changed = false;
+
     if (draw) {
         ui->headers->update();
         ui->video_area->update();
@@ -568,8 +572,10 @@ void Timeline::delete_selection(QVector<Selection>& selections, bool ripple_dele
 
 void Timeline::set_zoom_value(double v) {
 	zoom = v;
-	ui->headers->update_zoom(zoom);
-	repaint_timeline();
+    zoom_just_changed = true;
+    ui->headers->update_zoom(zoom);
+
+    repaint_timeline();
 
     // TODO find a way to gradually move towards target_scroll instead of just centering it?
     center_scroll_to_playhead();
diff --git a/panels/timeline.h b/panels/timeline.h
index a218ae2cd..eb14d5631 100644
--- a/panels/timeline.h
+++ b/panels/timeline.h
@@ -120,6 +120,7 @@ public:
     long cursor_frame;
     int cursor_track;
     double zoom;
+    bool zoom_just_changed;
 	long drag_frame_start;
 	int drag_track_start;
 	void update_effect_controls();