X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=f1486ad9c4cf733dfa8b170c6b1827edcf609621;hp=1cb03afcf3cbf5f5c0fd33ebee12c226b5a5797e;hb=4cc2e925cf5056bc11514cc44da820eada72ce56;hpb=99d4a087a01e498ec4a10a0d1947801b6b4fb8d4

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 1cb03afc..f1486ad9 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -129,6 +129,7 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
 	scale_(1e-3),
 	offset_(0),
 	updating_scroll_(false),
+	settings_restored_(false),
 	sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui()
 	always_zoom_to_fit_(false),
 	tick_period_(0),
@@ -351,6 +352,8 @@ void View::restore_settings(QSettings &settings)
 		scroll_needs_defaults_ = false;
 		// Note: see eventFilter() for additional information
 	}
+
+	settings_restored_ = true;
 }
 
 vector< shared_ptr<TimeItem> > View::time_items() const
@@ -1088,7 +1091,9 @@ void View::on_splitter_moved()
 
 void View::on_repeat_splitter_expansion()
 {
-	expand_header_to_fit();
+	// Don't mess with the header if settings were restored in the meanwhile
+	if (!settings_restored_)
+		expand_header_to_fit();
 }
 
 void View::h_scroll_value_changed(int value)