MainBar: Don't list keys twice

[pulseview.git] / pv / toolbars / mainbar.cpp

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 50a90643d71f406919172827350318a8517b5056..acab199da8853dbd075c1665a3dabdbb8a4fe5ab 100644 (file)
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -37,7 +37,7 @@
 #include <pv/popups/channels.hpp>
 #include <pv/util.hpp>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::back_inserter;
 using std::copy;
@@ -85,6 +85,7 @@ MainBar::MainBar(Session &session, MainWindow &main_window) :
 
        setMovable(false);
        setFloatable(false);
+       setContextMenuPolicy(Qt::PreventContextMenu);
 
        // Device selector menu
        connect(&device_selector_, SIGNAL(device_selected()),
@@ -214,8 +215,6 @@ void MainBar::update_sample_rate_selector()
        const auto iter = keys.find(ConfigKey::SAMPLERATE);
        if (iter != keys.end() &&
                (*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
-               const auto keys = device->config_keys(
-                       ConfigKey::DEVICE_OPTIONS);
                try {
                        gvar_dict = device->config_list(ConfigKey::SAMPLERATE);
                } catch(const sigrok::Error &e) {