1 files changed, 24 insertions, 19 deletions

diff --git a/src/frontend/qt_sdl/FirmwareSettingsDialog.cpp b/src/frontend/qt_sdl/FirmwareSettingsDialog.cpp
index 0b2cad6..ffca567 100644
--- a/src/frontend/qt_sdl/FirmwareSettingsDialog.cpp
+++ b/src/frontend/qt_sdl/FirmwareSettingsDialog.cpp
@@ -1,5 +1,5 @@
 /*
-    Copyright 2016-2020 Arisotura
+    Copyright 2016-2022 melonDS team
 
     This file is part of melonDS.
 
@@ -18,6 +18,7 @@
 
 #include <QMessageBox>
 
+#include "Platform.h"
 #include "Config.h"
 
 #include "FirmwareSettingsDialog.h"
@@ -35,7 +36,7 @@ FirmwareSettingsDialog::FirmwareSettingsDialog(QWidget* parent) : QDialog(parent
     ui->setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
 
-    ui->usernameEdit->setText(Config::FirmwareUsername);
+    ui->usernameEdit->setText(QString::fromStdString(Config::FirmwareUsername));
 
     ui->languageBox->addItems(languages);
     ui->languageBox->setCurrentIndex(Config::FirmwareLanguage);
@@ -59,13 +60,19 @@ FirmwareSettingsDialog::FirmwareSettingsDialog(QWidget* parent) : QDialog(parent
     }
     ui->colorsEdit->setCurrentIndex(Config::FirmwareFavouriteColour);
 
-    ui->messageEdit->setText(Config::FirmwareMessage);
+    ui->messageEdit->setText(QString::fromStdString(Config::FirmwareMessage));
 
     ui->overrideFirmwareBox->setChecked(Config::FirmwareOverrideSettings);
 
-    ui->txtMAC->setText(Config::FirmwareMAC);
-    ui->cbRandomizeMAC->setChecked(Config::RandomizeMAC != 0);
-    on_cbRandomizeMAC_toggled();
+    ui->txtMAC->setText(QString::fromStdString(Config::FirmwareMAC));
+
+    on_overrideFirmwareBox_toggled();
+
+    int inst = Platform::InstanceID();
+    if (inst > 0)
+        ui->lblInstanceNum->setText(QString("Configuring settings for instance %1").arg(inst+1));
+    else
+        ui->lblInstanceNum->hide();
 }
 
 FirmwareSettingsDialog::~FirmwareSettingsDialog()
@@ -123,7 +130,7 @@ void FirmwareSettingsDialog::done(int r)
             return;
         }
 
-        int newOverride = ui->overrideFirmwareBox->isChecked();
+        bool newOverride = ui->overrideFirmwareBox->isChecked();
 
         std::string newName = ui->usernameEdit->text().toStdString();
         int newLanguage = ui->languageBox->currentIndex();
@@ -133,17 +140,15 @@ void FirmwareSettingsDialog::done(int r)
         std::string newMessage = ui->messageEdit->text().toStdString();
 
         std::string newMAC = ui->txtMAC->text().toStdString();
-        int newRandomizeMAC = ui->cbRandomizeMAC->isChecked() ? 1:0;
 
         if (   newOverride != Config::FirmwareOverrideSettings
-            || strcmp(newName.c_str(), Config::FirmwareUsername) != 0
+            || newName != Config::FirmwareUsername
             || newLanguage != Config::FirmwareLanguage
             || newFavColor != Config::FirmwareFavouriteColour
             || newBirthdayDay != Config::FirmwareBirthdayDay
             || newBirthdayMonth != Config::FirmwareBirthdayMonth
-            || strcmp(newMessage.c_str(), Config::FirmwareMessage) != 0
-            || strcmp(newMAC.c_str(), Config::FirmwareMAC) != 0
-            || newRandomizeMAC != Config::RandomizeMAC)
+            || newMessage != Config::FirmwareMessage
+            || newMAC != Config::FirmwareMAC)
         {
             if (RunningSomething
                 && QMessageBox::warning(this, "Reset necessary to apply changes",
@@ -153,15 +158,14 @@ void FirmwareSettingsDialog::done(int r)
 
             Config::FirmwareOverrideSettings = newOverride;
 
-            strncpy(Config::FirmwareUsername, newName.c_str(), 63); Config::FirmwareUsername[63] = '\0';
+            Config::FirmwareUsername = newName;
             Config::FirmwareLanguage = newLanguage;
             Config::FirmwareFavouriteColour = newFavColor;
             Config::FirmwareBirthdayDay = newBirthdayDay;
             Config::FirmwareBirthdayMonth = newBirthdayMonth;
-            strncpy(Config::FirmwareMessage, newMessage.c_str(), 1023); Config::FirmwareMessage[1023] = '\0';
+            Config::FirmwareMessage = newMessage;
 
-            strncpy(Config::FirmwareMAC, newMAC.c_str(), 17); Config::FirmwareMAC[17] = '\0';
-            Config::RandomizeMAC = newRandomizeMAC;
+            Config::FirmwareMAC = newMAC;
 
             Config::Save();
 
@@ -202,8 +206,9 @@ void FirmwareSettingsDialog::on_cbxBirthdayMonth_currentIndexChanged(int idx)
     }
 }
 
-void FirmwareSettingsDialog::on_cbRandomizeMAC_toggled()
+void FirmwareSettingsDialog::on_overrideFirmwareBox_toggled()
 {
-    bool disable = ui->cbRandomizeMAC->isChecked();
-    ui->txtMAC->setDisabled(disable);
+    bool disable = !ui->overrideFirmwareBox->isChecked();
+    ui->grpUserSettings->setDisabled(disable);
+    ui->grpWifiSettings->setDisabled(disable);
 }