mawei/MoreTore
1
0
Fork 0
mirror of https://github.com/MoreTore/openpilot.git synced 2026-08-05 08:16:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui: remove cache from getDongleId()

Browse Source 
old-commit-hash: d1fb979962
This commit is contained in:
Willem Melching
2021-08-02 11:29:39 +02:00
parent c40edd4b56
commit a2749618ec
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/offroad/settings.cc
+1 -1
View File
@@ -95,7 +95,7 @@ TogglesPanel::TogglesPanel(QWidget *parent) : QWidget(parent) {
DevicePanel::DevicePanel(QWidget* parent) : QWidget(parent) {
QVBoxLayout *main_layout = new QVBoxLayout(this);
Params params = Params();
main_layout->addWidget(new LabelControl("Dongle ID", getDongleId().value_or("")));
main_layout->addWidget(new LabelControl("Dongle ID", getDongleId().value_or("N/A")));
main_layout->addWidget(horizontal_line());
QString serial = QString::fromStdString(params.get("HardwareSerial", false));
selfdrive/ui/qt/util.cc
+6 -7
View File
@@ -17,14 +17,13 @@ QString getBrandVersion() {
}
std::optional<QString> getDongleId() {
static QString dongleId;
if (dongleId.isEmpty()) {
std::string id = Params().get("DongleId");
if (!id.empty() && id != "UnregisteredDevice") {
dongleId = QString::fromStdString(id);
}
std::string id = Params().get("DongleId");
if (!id.empty() && (id != "UnregisteredDevice")) {
return QString::fromStdString(id);
} else {
return {};
}
return !dongleId.isEmpty() ? std::make_optional(dongleId) : std::nullopt;
}
void configFont(QPainter &p, const QString &family, int size, const QString &style) {