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 60eb8e8a576205a8ec480f2a6669fc43695cb82c..7da77bd3bb08c922bd47d95e9fad480b07fab30f 100644 (file)
--- a/pv/widgets/decodermenu.cpp
+++ b/pv/widgets/decodermenu.cpp
@@ -22,19 +22,18 @@
 
 #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);
-       for(; l; l = l->next)
-       {
+       for (; l; l = l->next) {
                const srd_decoder *const d = (srd_decoder*)l->data;
                assert(d);
 
@@ -43,14 +42,14 @@ DecoderMenu::DecoderMenu(QWidget *parent, bool first_level_decoder) :
                        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*)));
 }