From: Soeren Apel <redacted>
Date: Sun, 5 Mar 2017 19:30:34 +0000 (+0100)
Subject: Tie the "always zoom to fit" setting in with the settings mgmt
X-Git-Tag: pulseview-0.4.0~170
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=90472a514889734ae79d156f2c30a2c9ca1fd611;p=pulseview.git

Tie the "always zoom to fit" setting in with the settings mgmt
---

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index f6048f04..d460e868 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -1232,6 +1232,14 @@ void View::capture_state_updated(int state)
 		set_time_unit(util::TimeUnit::Samples);
 
 		trigger_markers_.clear();
+
+		// Activate "always zoom to fit" if the setting is enabled
+		GlobalSettings settings;
+		bool state = settings.value(GlobalSettings::Key_View_AlwaysZoomToFit).toBool();
+		if (state) {
+			always_zoom_to_fit_ = true;
+			always_zoom_to_fit_changed(always_zoom_to_fit_);
+		}
 	}
 
 	if (state == Session::Stopped) {
@@ -1242,7 +1250,7 @@ void View::capture_state_updated(int state)
 		// Reset "always zoom to fit", the acquisition has stopped
 		if (always_zoom_to_fit_) {
 			always_zoom_to_fit_ = false;
-			always_zoom_to_fit_changed(false);
+			always_zoom_to_fit_changed(always_zoom_to_fit_);
 		}
 	}
 }