TraceView: Fix "always zoom to fit" feature

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 04bb99205636fd50ffe18872f56dd3ba2dcd3bb5..23de2087c94120e030834c9e1dfb0e8ec6312952 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -1251,6 +1251,8 @@ void View::capture_state_updated(int state)
 
                // Reset "always zoom to fit", the acquisition has stopped
                if (always_zoom_to_fit_) {
+                       // Perform a final zoom-to-fit before disabling
+                       zoom_fit(always_zoom_to_fit_);
                        always_zoom_to_fit_ = false;
                        always_zoom_to_fit_changed(always_zoom_to_fit_);
                }
@@ -1272,10 +1274,9 @@ void View::data_updated()
 
 void View::perform_delayed_view_update()
 {
-       if (always_zoom_to_fit_)
+       if (always_zoom_to_fit_) {
                zoom_fit(true);
-
-       if (sticky_scrolling_) {
+       } else if (sticky_scrolling_) {
                // Make right side of the view sticky
                double length = 0;
                Timestamp offset;