X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=session.c;h=27fa262135d757dec7235c89e546bc1d975ae3d0;hp=4648ed8b9c8481fa1d4113943e41e1290b224a5e;hb=f9170968a3ebd9a7109312052ad0b9fb805b5090;hpb=4ed1cdea40388d1888f073d51ebc484031fee3d9

diff --git a/session.c b/session.c
index 4648ed8..27fa262 100644
--- a/session.c
+++ b/session.c
@@ -372,7 +372,7 @@ int opt_to_gvar(char *key, char *value, struct sr_config *src)
 			break;
 		src->data = g_variant_new_int32(tmp_u64);
 		break;
-	case SR_T_CHAR:
+	case SR_T_STRING:
 		src->data = g_variant_new_string(value);
 		break;
 	case SR_T_BOOL:
@@ -457,8 +457,6 @@ void run_session(void)
 	GVariant *gvar;
 	struct sr_dev_inst *sdi;
 	uint64_t min_samples, max_samples;
-	int max_channels, i;
-	char **triggerlist;
 
 	devices = device_scan();
 	if (!devices) {
@@ -500,18 +498,10 @@ void run_session(void)
 	}
 
 	if (opt_triggers) {
-		if (!(triggerlist = sr_parse_triggerstring(sdi, opt_triggers))) {
+		if (!parse_triggerstring(sdi, opt_triggers)) {
 			sr_session_destroy();
 			return;
 		}
-		max_channels = g_slist_length(sdi->channels);
-		for (i = 0; i < max_channels; i++) {
-			if (triggerlist[i]) {
-				sr_dev_trigger_set(sdi, i, triggerlist[i]);
-				g_free(triggerlist[i]);
-			}
-		}
-		g_free(triggerlist);
 	}
 
 	if (opt_continuous) {