Merge branch 'master' of github.com:Arisotura/melonDS

sinistarZ · Apr 1, 2022 · 1dfcf20 · 1dfcf20
2 parents d296f28 + 02b859a
commit 1dfcf20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/frontend/qt_sdl/FirmwareSettingsDialog.cpp b/src/frontend/qt_sdl/FirmwareSettingsDialog.cpp
@@ -65,6 +65,8 @@ FirmwareSettingsDialog::FirmwareSettingsDialog(QWidget* parent) : QDialog(parent
 
     ui->txtMAC->setText(QString::fromStdString(Config::FirmwareMAC));
     ui->cbRandomizeMAC->setChecked(Config::RandomizeMAC);
+
+    on_overrideFirmwareBox_toggled();
     on_cbRandomizeMAC_toggled();
 }
 
@@ -202,6 +204,13 @@ void FirmwareSettingsDialog::on_cbxBirthdayMonth_currentIndexChanged(int idx)
     }
 }
 
+void FirmwareSettingsDialog::on_overrideFirmwareBox_toggled()
+{
+    bool disable = !ui->overrideFirmwareBox->isChecked();
+    ui->grpUserSettings->setDisabled(disable);
+    ui->grpWifiSettings->setDisabled(disable);
+}
+
 void FirmwareSettingsDialog::on_cbRandomizeMAC_toggled()
 {
     bool disable = ui->cbRandomizeMAC->isChecked();

diff --git a/src/frontend/qt_sdl/FirmwareSettingsDialog.h b/src/frontend/qt_sdl/FirmwareSettingsDialog.h
@@ -123,6 +123,7 @@ private slots:
     void done(int r);
 
     void on_cbxBirthdayMonth_currentIndexChanged(int idx);
+    void on_overrideFirmwareBox_toggled();
     void on_cbRandomizeMAC_toggled();
 
 private: