Fix #805 by resetting selected device on failure

[pulseview.git] / pv / widgets / decodermenu.cpp

diff --git a/pv/widgets/decodermenu.cpp b/pv/widgets/decodermenu.cpp
index 68fc478124e0718d5fc9b22263766d8db1582f5f..7da77bd3bb08c922bd47d95e9fad480b07fab30f 100644 (file)
--- a/pv/widgets/decodermenu.cpp
+++ b/pv/widgets/decodermenu.cpp
@@ -18,31 +18,38 @@
  * 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) :
+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);
-       for(; l; l = l->next)
-       {
-               QAction *const action = addAction(QString(
-                       ((srd_decoder*)l->data)->name));
-               action->setData(qVariantFromValue(l->data));
-               _mapper.setMapping(action, action);
-               connect(action, SIGNAL(triggered()),
-                       &_mapper, SLOT(map()));
+       for (; l; l = l->next) {
+               const srd_decoder *const d = (srd_decoder*)l->data;
+               assert(d);
+
+               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);
+                       connect(action, SIGNAL(triggered()),
+                               &mapper_, SLOT(map()));
+               }
        }
        g_slist_free(l);
 
-       connect(&_mapper, SIGNAL(mapped(QObject*)),
+       connect(&mapper_, SIGNAL(mapped(QObject*)),
                this, SLOT(on_action(QObject*)));
 }