X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=767ab6f31149bd4881b0db163635c86025c08818;hp=3480d8cc2fcaaa62feacb6f85f7f5651f9019328;hb=951b5ae77957c8086f05fcd2b26beaf32f3e8e3e;hpb=e37e05f7f0b20076b21cf5644dc94915111facdb

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 3480d8cc..767ab6f3 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -509,7 +509,6 @@ void MainWindow::restore_ui_settings()
 
 	map<string, string> dev_info;
 	list<string> key_list;
-	string value;
 
 	settings.beginGroup("MainWindow");
 
@@ -530,12 +529,12 @@ void MainWindow::restore_ui_settings()
 	key_list.push_back("connection_id");
 
 	for (string key : key_list) {
-		if (!settings.contains(QString::fromUtf8(key.c_str())))
+		const QString k = QString::fromStdString(key);
+		if (!settings.contains(k))
 			continue;
 
-		value = settings.value(QString::fromUtf8(key.c_str())).toString().toStdString();
-
-		if (value.size() > 0)
+		const string value = settings.value(k).toString().toStdString();
+		if (!value.empty())
 			dev_info.insert(std::make_pair(key, value));
 	}