X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=acab199da8853dbd075c1665a3dabdbb8a4fe5ab;hp=50a90643d71f406919172827350318a8517b5056;hb=3c35fcf0a15233dfd8042bc3063f7a4bb9d24256;hpb=079d39ea735015597a65390e4c5cacc7d272f78c

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 50a90643..acab199d 100644
--- 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) {