X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=input.c;h=4f51e11553e3bb68c1c714610b28f5b7e3fb2922;hp=1b5d07e6c0ff19a9efa00370e2623035567afcc8;hb=6f7b4c5d7eb49642f8221a85ee6987751fcd81ce;hpb=64f9f5b26544e32b469e59ddca68421375426c05

diff --git a/input.c b/input.c
index 1b5d07e..4f51e11 100644
--- a/input.c
+++ b/input.c
@@ -137,6 +137,7 @@ static void load_input_file_module(void)
 		}
 
 	}
+	sr_input_end(in);
 	sr_input_free(in);
 	g_string_free(buf, TRUE);
 
@@ -151,25 +152,33 @@ void load_input_file(void)
 	GSList *devices;
 	int ret;
 
-	if (strcmp(opt_input_file, "-") && sr_session_load(opt_input_file, &session) == SR_OK) {
-		/* sigrok session file */
-		ret = sr_session_dev_list(session, &devices);
-		if (ret != SR_OK || !devices->data) {
-			g_critical("Failed to access session device.");
-			sr_session_destroy(session);
-			return;
-		}
-		sdi = devices->data;
-		if (select_channels(sdi) != SR_OK) {
-			sr_session_destroy(session);
-			return;
-		}
-		sr_session_datafeed_callback_add(session, datafeed_in, NULL);
-		sr_session_start(session);
-		sr_session_run(session);
-		sr_session_stop(session);
-	} else {
-		/* fall back on input modules */
+	if (!strcmp(opt_input_file, "-")) {
+		/* Input from stdin is never a session file. */
 		load_input_file_module();
+	} else {
+		if ((ret = sr_session_load(opt_input_file, &session)) == SR_OK) {
+			/* sigrok session file */
+			ret = sr_session_dev_list(session, &devices);
+			if (ret != SR_OK || !devices || !devices->data) {
+				g_critical("Failed to access session device.");
+				sr_session_destroy(session);
+				return;
+			}
+			sdi = devices->data;
+			if (select_channels(sdi) != SR_OK) {
+				sr_session_destroy(session);
+				return;
+			}
+			sr_session_datafeed_callback_add(session, datafeed_in, NULL);
+			sr_session_start(session);
+			sr_session_run(session);
+			sr_session_stop(session);
+		} else if (ret != SR_ERR) {
+			/* It's a session file, but it didn't work out somehow. */
+			g_critical("Failed to load session file.");
+		} else {
+			/* Fall back on input modules. */
+			load_input_file_module();
+		}
 	}
 }