ui: remove cache from getDongleId()

old-commit-hash: d1fb979962
commatwo_master
Willem Melching 4 years ago
parent c40edd4b56
commit a2749618ec
  1. 2
      selfdrive/ui/qt/offroad/settings.cc
  2. 11
      selfdrive/ui/qt/util.cc

@ -95,7 +95,7 @@ TogglesPanel::TogglesPanel(QWidget *parent) : QWidget(parent) {
DevicePanel::DevicePanel(QWidget* parent) : QWidget(parent) { DevicePanel::DevicePanel(QWidget* parent) : QWidget(parent) {
QVBoxLayout *main_layout = new QVBoxLayout(this); QVBoxLayout *main_layout = new QVBoxLayout(this);
Params params = Params(); 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()); main_layout->addWidget(horizontal_line());
QString serial = QString::fromStdString(params.get("HardwareSerial", false)); QString serial = QString::fromStdString(params.get("HardwareSerial", false));

@ -17,14 +17,13 @@ QString getBrandVersion() {
} }
std::optional<QString> getDongleId() { std::optional<QString> getDongleId() {
static QString dongleId;
if (dongleId.isEmpty()) {
std::string id = Params().get("DongleId"); std::string id = Params().get("DongleId");
if (!id.empty() && id != "UnregisteredDevice") {
dongleId = QString::fromStdString(id); 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) { void configFont(QPainter &p, const QString &family, int size, const QString &style) {

Loading…
Cancel
Save