X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;fp=pv%2Fsession.cpp;h=50e89e567041c2ec186e47e0d387457808f452a3;hp=80dad66ee929ef36974da0573cb982f3843b4e06;hb=d7168e582c71ebcc359b12efed83daa2a6b6f28e;hpb=a3110cabd9f265eb066fadbfa2d82c0a6bbd6d18

diff --git a/pv/session.cpp b/pv/session.cpp
index 80dad66..50e89e5 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -483,6 +483,7 @@ void Session::load_init_file(const string &file_name, const string &format)
 	map<string, Glib::VariantBase> input_opts;
 
 	if (!format.empty()) {
+		// Got a user provided input format spec.
 		const map<string, shared_ptr<InputFormat> > formats =
 			device_manager_.context()->input_formats();
 		auto user_opts = pv::util::split_string(format, ":");
@@ -499,6 +500,11 @@ void Session::load_init_file(const string &file_name, const string &format)
 		input_format = (*iter).second;
 		input_opts = input_format_options(user_opts,
 			input_format->options());
+	} else {
+		// (Try to) auto detect the input format. Lookup failure
+		// is not fatal, when no input module claimed responsibility,
+		// then a session file gets loaded.
+		input_format = device_manager_.context()->input_format_match(file_name);
 	}
 
 	load_file(QString::fromStdString(file_name), input_format, input_opts);