diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index d53a2f46ac..ab70a6106c 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -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)); diff --git a/selfdrive/ui/qt/util.cc b/selfdrive/ui/qt/util.cc index f352fedac3..40a531062f 100644 --- a/selfdrive/ui/qt/util.cc +++ b/selfdrive/ui/qt/util.cc @@ -17,14 +17,13 @@ QString getBrandVersion() { } std::optional 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) {