X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fdecodermenu.cpp;h=f3c4e06ac63d1d59c4b6cef67f80b4a2eb1561b6;hp=23c74a0ac70abe3f1e25db3e871b9a5291349fdf;hb=7a01bd3654ed046216308fa64edfd79be7cd525f;hpb=f69ec72d3cead13847045ca9cdf15d503f69e370

diff --git a/pv/widgets/decodermenu.cpp b/pv/widgets/decodermenu.cpp
index 23c74a0a..f3c4e06a 100644
--- a/pv/widgets/decodermenu.cpp
+++ b/pv/widgets/decodermenu.cpp
@@ -18,16 +18,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <cassert>
+
 #include <libsigrokdecode/libsigrokdecode.h>
 
-#include "decodermenu.h"
+#include "decodermenu.hpp"
 
 namespace pv {
 namespace widgets {
 
 DecoderMenu::DecoderMenu(QWidget *parent, bool first_level_decoder) :
 	QMenu(parent),
-	_mapper(this)
+	mapper_(this)
 {
 	GSList *l = g_slist_sort(g_slist_copy(
 		(GSList*)srd_decoder_list()), decoder_name_cmp);
@@ -36,18 +38,19 @@ DecoderMenu::DecoderMenu(QWidget *parent, bool first_level_decoder) :
 		const srd_decoder *const d = (srd_decoder*)l->data;
 		assert(d);
 
-		if (!first_level_decoder || d->probes || d->opt_probes) {
+		const bool have_channels = (d->channels || d->opt_channels) != 0;
+		if (first_level_decoder == have_channels) {
 			QAction *const action =
 				addAction(QString::fromUtf8(d->name));
 			action->setData(qVariantFromValue(l->data));
-			_mapper.setMapping(action, action);
+			mapper_.setMapping(action, action);
 			connect(action, SIGNAL(triggered()),
-				&_mapper, SLOT(map()));
+				&mapper_, SLOT(map()));
 		}
 	}
 	g_slist_free(l);
 
-	connect(&_mapper, SIGNAL(mapped(QObject*)),
+	connect(&mapper_, SIGNAL(mapped(QObject*)),
 		this, SLOT(on_action(QObject*)));
 }