X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fapplication.cpp;h=15195d067da801e594ce573ccf756a79200d4986;hb=0f76477f61d6d837f01312f4c46d9c713a04a705;hp=3a0ac0f13a5dc7986ca737615d9858998f775055;hpb=5a8f700cd1adfcfc316393969d11fba8173e9bbf;p=pulseview.git

diff --git a/pv/application.cpp b/pv/application.cpp
index 3a0ac0f1..15195d06 100644
--- a/pv/application.cpp
+++ b/pv/application.cpp
@@ -69,7 +69,7 @@ Application::Application(int &argc, char* argv[]) :
 
 const QStringList Application::get_languages() const
 {
-	QStringList files = QDir(":/l10n/").entryList(QStringList("*.qm"), QDir::Files);
+	const QStringList files = QDir(":/l10n/").entryList(QStringList("*.qm"), QDir::Files);
 
 	QStringList result;
 	result << "en";  // Add default language to the set
@@ -143,7 +143,7 @@ void Application::on_setting_changed(const QString &key, const QVariant &value)
 		switch_language(value.toString());
 }
 
-void Application::collect_version_info(shared_ptr<sigrok::Context> context)
+void Application::collect_version_info(pv::DeviceManager &device_manager)
 {
 	// Library versions and features
 	version_info_.emplace_back(applicationName(), applicationVersion());
@@ -211,17 +211,18 @@ void Application::collect_version_info(shared_ptr<sigrok::Context> context)
 #endif
 
 	// Device drivers
-	for (auto& entry : context->drivers())
-		driver_list_.emplace_back(QString::fromUtf8(entry.first.c_str()),
-			QString::fromUtf8(entry.second->long_name().c_str()));
+	for (auto& entry : device_manager.context()->drivers())
+		if (device_manager.driver_supported(entry.second))
+			driver_list_.emplace_back(QString::fromUtf8(entry.first.c_str()),
+				QString::fromUtf8(entry.second->long_name().c_str()));
 
 	// Input formats
-	for (auto& entry : context->input_formats())
+	for (auto& entry : device_manager.context()->input_formats())
 		input_format_list_.emplace_back(QString::fromUtf8(entry.first.c_str()),
 			QString::fromUtf8(entry.second->description().c_str()));
 
 	// Output formats
-	for (auto& entry : context->output_formats())
+	for (auto& entry : device_manager.context()->output_formats())
 		output_format_list_.emplace_back(QString::fromUtf8(entry.first.c_str()),
 			QString::fromUtf8(entry.second->description().c_str()));