X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=638d75b5179fbb63c2e0151d6c6d09ff215b95c5;hp=43d1e7d2607dbf2ab9a95377f806eed9d8c0640c;hb=611c86259f66dd1766b10b1e1b671b0fadd51fe2;hpb=1fa702cf18e574e439ad20028203dd157cbc23bf

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 43d1e7d2..638d75b5 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -313,6 +313,9 @@ shared_ptr<subwindows::SubWindowBase> MainWindow::add_subwindow(
 	if (v->has_toolbar())
 		dock_main->addToolBar(v->create_toolbar(dock_main));
 
+	if (v->minimum_width() > 0)
+		dock->setMinimumSize(v->minimum_width(), 0);
+
 	return v;
 }
 
@@ -396,10 +399,13 @@ void MainWindow::remove_session(shared_ptr<Session> session)
 }
 
 void MainWindow::add_session_with_file(string open_file_name,
-	string open_file_format)
+	string open_file_format,
+	string open_setup_file_name)
 {
 	shared_ptr<Session> session = add_session();
-	session->load_init_file(open_file_name, open_file_format);
+	session->load_init_file(open_file_name,
+		open_file_format,
+		open_setup_file_name);
 }
 
 void MainWindow::add_default_session()