X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=decode.c;h=ac0e3e17cc283e51d16a0aa8e7c21be846faf657;hb=527dd7262e49dd051ff554401f9cb21c2c9006dd;hp=a4d4652b36a274dca32d5a104d22c3c912a388b3;hpb=a92fe14dd86aceb5c75be26247345faed70c6283;p=sigrok-cli.git

diff --git a/decode.c b/decode.c
index a4d4652..ac0e3e1 100644
--- a/decode.c
+++ b/decode.c
@@ -139,7 +139,7 @@ static int register_pd(char *opt_pds, char *opt_pd_annotations)
 
 	pdtokens = g_strsplit(opt_pds, ",", 0);
 	for (pdtok = pdtokens; *pdtok; pdtok++) {
-		if (!(pd_opthash = parse_generic_arg(*pdtok, TRUE))) {
+		if (!(pd_opthash = parse_generic_arg(*pdtok, TRUE, NULL))) {
 			g_critical("Invalid protocol decoder option '%s'.", *pdtok);
 			break;
 		}
@@ -684,6 +684,8 @@ void show_pd_annotations(struct srd_proto_data *pdata, void *cb_data)
 		show_class = TRUE;
 		show_abbrev = TRUE;
 	}
+	if (opt_pd_ann_class)
+		show_class = TRUE;
 
 	/*
 	 * Display the annotation's fields after the layout was