Only show first-level decoders in the menu

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 2a74d5b292a40f8ac6ecaf42ba1dbdc791eef7a5..fcc929e988c12d8f1755be8b436c1b348b77447f 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -220,7 +220,7 @@ void MainWindow::setup_ui()
                "MainWindow", "&Decoders", 0, QApplication::UnicodeUTF8));
 
        pv::widgets::DecoderMenu *const menu_decoders_add =
-               new pv::widgets::DecoderMenu(menu_decoders);
+               new pv::widgets::DecoderMenu(menu_decoders, true);
        menu_decoders_add->setTitle(QApplication::translate(
                "MainWindow", "&Add", 0, QApplication::UnicodeUTF8));
        connect(menu_decoders_add, SIGNAL(decoder_selected(srd_decoder*)),
@@ -296,6 +296,10 @@ void MainWindow::update_device_list()
        std::copy(_device_manager.devices().begin(),
                _device_manager.devices().end(), std::back_inserter(devices));
 
+       if (std::find(devices.begin(), devices.end(), selected_device) ==
+               devices.end())
+               devices.push_back(selected_device);
+
        _sampling_bar->set_device_list(devices);
 
        if (selected_device)
@@ -314,6 +318,8 @@ void MainWindow::load_file(QString file_name)
                show_session_error(tr("Failed to load ") + file_name, e);
        }
 
+       update_device_list();
+
        _session.start_capture(boost::bind(&MainWindow::session_error, this,
                errorMessage, infoMessage));
 }