Fix off-by-one in PD menu list construction.

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 9873541dd5dbe4dc24aea9be777a949cc15c0e96..0e971ce06cc7373f6da132479483101f187aa3c7 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -305,14 +305,14 @@ void MainWindow::setup_add_decoders(QMenu *parent)
 {
        GSList *l = g_slist_sort(g_slist_copy(
                (GSList*)srd_decoder_list()), decoder_name_cmp);
-       while ((l = l->next)) {
+       do {
                QAction *const action = parent->addAction(QString(
                        ((srd_decoder*)l->data)->name));
                action->setData(qVariantFromValue(l->data));
                _decoders_add_mapper.setMapping(action, action);
                connect(action, SIGNAL(triggered()),
                        &_decoders_add_mapper, SLOT(map()));
-       }
+       } while ((l = l->next));
        g_slist_free(l);
 }
 
@@ -388,8 +388,19 @@ void MainWindow::add_decoder(QObject *action)
                (srd_decoder*)((QAction*)action)->data().value<void*>();
        assert(dec);
 
-       dialogs::Decoder dlg(this);
-       dlg.exec();
+       const std::vector< boost::shared_ptr<view::Signal> > &sigs =
+               _session.get_signals();
+
+       GHashTable *const options = g_hash_table_new_full(g_str_hash,
+               g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
+
+       dialogs::Decoder dlg(this, dec, sigs, options);
+       if(dlg.exec() != QDialog::Accepted) {
+               g_hash_table_destroy(options);
+               return;
+       }
+
+       _session.add_decoder(dec, dlg.get_probes(), options);
 }
 
 void MainWindow::run_stop()