X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=5d92362e714bf87175b616495a3f3a3e5c844e78;hb=7ac79fb6edfdece09b9f503142bc647dc4ac52aa;hp=6b31ef5ce027afed17c215f9456e9877e5d4c8ce;hpb=35e8578ecc6926986f62d8e5daf68dd0b35ba085;p=sigrok-cli.git

diff --git a/session.c b/session.c
index 6b31ef5..5d92362 100644
--- a/session.c
+++ b/session.c
@@ -193,7 +193,9 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 			g_critical("Failed to initialize output module.");
 
 		/* Set up backup analog output module. */
-		oa = sr_output_new(sr_output_find("analog"), NULL, sdi, NULL);
+		if (outfile)
+			oa = sr_output_new(sr_output_find("analog"), NULL,
+					sdi, NULL);
 
 		rcvd_samples_logic = rcvd_samples_analog = 0;
 
@@ -311,9 +313,7 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 
 	if (o && !opt_pds) {
 		if (sr_output_send(o, packet, &out) == SR_OK) {
-			if (!out || (out->len == 0
-					&& !opt_output_format
-					&& packet->type == SR_DF_ANALOG)) {
+			if (oa && !out) {
 				/*
 				 * The user didn't specify an output module,
 				 * but needs to see this analog data.
@@ -340,7 +340,8 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 			sr_output_free(o);
 		o = NULL;
 
-		sr_output_free(oa);
+		if (oa)
+			sr_output_free(oa);
 		oa = NULL;
 
 		if (outfile && outfile != stdout)