X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fprotocol.c;h=34a3935b9fd4fa6e36f3ceab8197652f2629e625;hb=HEAD;hp=d2101f2a8170c892af1311c7a0e12f482aa3d84e;hpb=fe185e4990edba03faf6485dcd6a42aeb3b9a008;p=libsigrok.git

diff --git a/src/hardware/hantek-dso/protocol.c b/src/hardware/hantek-dso/protocol.c
index d2101f2a..34a3935b 100644
--- a/src/hardware/hantek-dso/protocol.c
+++ b/src/hardware/hantek-dso/protocol.c
@@ -275,8 +275,10 @@ static int dso2250_set_trigger_samplerate(const struct sr_dev_inst *sdi)
 	memset(cmdstring, 0, sizeof(cmdstring));
 	/* Command */
 	cmdstring[0] = CMD_2250_SET_TRIGGERSOURCE;
-	sr_dbg("Trigger source %s.", devc->triggersource);
-	if (!strcmp("CH2", devc->triggersource))
+	sr_dbg("Trigger source %s.", devc->triggersource ? : "<none>");
+	if (!devc->triggersource)
+		tmp = 0;
+	else if (!strcmp("CH2", devc->triggersource))
 		tmp = 3;
 	else if (!strcmp("CH1", devc->triggersource))
 		tmp = 2;
@@ -421,8 +423,10 @@ SR_PRIV int dso_set_trigger_samplerate(const struct sr_dev_inst *sdi)
 	cmdstring[0] = CMD_SET_TRIGGER_SAMPLERATE;
 
 	/* Trigger source */
-	sr_dbg("Trigger source %s.", devc->triggersource);
-	if (!strcmp("CH2", devc->triggersource))
+	sr_dbg("Trigger source %s.", devc->triggersource ? : "<none>");
+	if (!devc->triggersource)
+		tmp = 2;
+	else if (!strcmp("CH2", devc->triggersource))
 		tmp = 0;
 	else if (!strcmp("CH1", devc->triggersource))
 		tmp = 1;
@@ -668,7 +672,7 @@ static int dso_set_relays(const struct sr_dev_inst *sdi)
 	if (devc->coupling[1] != COUPLING_AC)
 		relays[6] = ~relays[6];
 
-	if (!strcmp(devc->triggersource, "EXT"))
+	if (devc->triggersource && strcmp(devc->triggersource, "EXT") == 0)
 		relays[7] = ~relays[7];
 
 	if (sr_log_loglevel_get() >= SR_LOG_DBG) {