X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=session.c;h=27fa262135d757dec7235c89e546bc1d975ae3d0;hb=cd62e027c0a3a8d97a6689d042b92699d8b619f3;hp=7d927b26423f436453ef80c2cdf19b4232370b44;hpb=9db40e9fa0ce27cb7cf0982363915ed13d117138;p=sigrok-cli.git diff --git a/session.c b/session.c index 7d927b2..27fa262 100644 --- a/session.c +++ b/session.c @@ -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) {