From a2dcf9e12fd93473c7cc5621daada0d82183f2c8 Mon Sep 17 00:00:00 2001
From: Cacodemon345 <wahil1976@outlook.com>
Date: Fri, 23 Dec 2022 20:49:13 +0600
Subject: [PATCH] qt_settingsdisplay: Changes are not lost on machine switch
 anymore

---
 src/qt/qt_settingsdisplay.cpp | 16 ++++++++++------
 src/qt/qt_settingsdisplay.hpp |  4 +++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/qt/qt_settingsdisplay.cpp b/src/qt/qt_settingsdisplay.cpp
index 6ed9e7094..f01d7fc4d 100644
--- a/src/qt/qt_settingsdisplay.cpp
+++ b/src/qt/qt_settingsdisplay.cpp
@@ -36,6 +36,8 @@ SettingsDisplay::SettingsDisplay(QWidget *parent)
 {
     ui->setupUi(this);
 
+    videoCard   = gfxcard;
+    videoCard_2 = gfxcard_2;
     onCurrentMachineChanged(machine);
 }
 
@@ -59,6 +61,7 @@ SettingsDisplay::onCurrentMachineChanged(int machineId)
 {
     // win_settings_video_proc, WM_INITDIALOG
     this->machineId = machineId;
+    auto curVideoCard = videoCard;
 
     auto *model      = ui->comboBoxVideo->model();
     auto  removeRows = model->rowCount();
@@ -80,7 +83,7 @@ SettingsDisplay::onCurrentMachineChanged(int machineId)
 
         if (video_card_available(c) && device_is_valid(video_dev, machineId)) {
             int row = Models::AddEntry(model, name, c);
-            if (c == gfxcard) {
+            if (c == curVideoCard) {
                 selectedRow = row - removeRows;
             }
         }
@@ -133,7 +136,8 @@ SettingsDisplay::on_comboBoxVideo_currentIndexChanged(int index)
     if (index < 0) {
         return;
     }
-    int videoCard = ui->comboBoxVideo->currentData().toInt();
+    auto curVideoCard_2 = videoCard_2;
+    videoCard = ui->comboBoxVideo->currentData().toInt();
     ui->pushButtonConfigure->setEnabled(video_card_has_config(videoCard) > 0);
 
     bool machineHasPci = machine_has_bus(machineId, MACHINE_BUS_PCI) > 0;
@@ -176,14 +180,14 @@ SettingsDisplay::on_comboBoxVideo_currentIndexChanged(int index)
 
         if (video_card_available(c) && device_is_valid(video_dev, machineId) && !(video_card_get_flags(c) == video_card_get_flags(videoCard))) {
             ui->comboBoxVideoSecondary->addItem(name, c);
-            if (c == gfxcard_2)
+            if (c == curVideoCard_2)
                 ui->comboBoxVideoSecondary->setCurrentIndex(ui->comboBoxVideoSecondary->count() - 1);
         }
 
         c++;
     }
 
-    if (gfxcard_2 == 0 || (machine_has_flags(machineId, MACHINE_VIDEO_ONLY) > 0)) {
+    if (videoCard_2 == 0 || (machine_has_flags(machineId, MACHINE_VIDEO_ONLY) > 0)) {
         ui->comboBoxVideoSecondary->setCurrentIndex(0);
         ui->pushButtonConfigureSecondary->setEnabled(false);
     }
@@ -208,8 +212,8 @@ SettingsDisplay::on_comboBoxVideoSecondary_currentIndexChanged(int index)
         ui->pushButtonConfigureSecondary->setEnabled(false);
         return;
     }
-    int videoCard = ui->comboBoxVideoSecondary->currentData().toInt();
-    ui->pushButtonConfigureSecondary->setEnabled(index != 0 && video_card_has_config(videoCard) > 0);
+    videoCard_2 = ui->comboBoxVideoSecondary->currentData().toInt();
+    ui->pushButtonConfigureSecondary->setEnabled(index != 0 && video_card_has_config(videoCard_2) > 0);
 }
 
 void
diff --git a/src/qt/qt_settingsdisplay.hpp b/src/qt/qt_settingsdisplay.hpp
index 0aab5c161..c02e55ce0 100644
--- a/src/qt/qt_settingsdisplay.hpp
+++ b/src/qt/qt_settingsdisplay.hpp
@@ -35,7 +35,9 @@ private slots:
 
 private:
     Ui::SettingsDisplay *ui;
-    int                  machineId = 0;
+    int                  machineId   = 0;
+    int                  videoCard   = 0;
+    int                  videoCard_2 = 0;
 };
 
 #endif // QT_SETTINGSDISPLAY_HPP