X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=287bfb6c51b7429467d72779abd2cadb3b3a76a1;hp=1cb03afcf3cbf5f5c0fd33ebee12c226b5a5797e;hb=e5cc818627748b95b6a6d14cc4cf509ab4669fa8;hpb=2a9fcd6212fd54d9589717670824d6bd020c694a

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 1cb03afc..287bfb6c 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),
@@ -140,7 +141,7 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
 	next_flag_text_('A'),
 	trigger_markers_(),
 	hover_point_(-1, -1),
-	scroll_needs_defaults_(false),
+	scroll_needs_defaults_(true),
 	saved_v_offset_(0)
 {
 	QVBoxLayout *root_layout = new QVBoxLayout(this);
@@ -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)