From a2749618ec73c6d0d2047ced381e378f114622d6 Mon Sep 17 00:00:00 2001
From: Willem Melching <willem.melching@gmail.com>
Date: Mon, 2 Aug 2021 11:29:39 +0200
Subject: [PATCH] ui: remove cache from getDongleId()

old-commit-hash: d1fb979962bb655939bd221715d20a2d1a4f6d75
---
 selfdrive/ui/qt/offroad/settings.cc |  2 +-
 selfdrive/ui/qt/util.cc             | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

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<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) {