From 3b39734e32f0321429c897a7d2960a25f86379d4 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Fri, 22 Aug 2025 20:57:27 +0500 Subject: [PATCH] Manager: Fix bugs with Voodoo type translation Also fix Voodoo and ISA RTC remaining after removal --- src/qt/qt_vmmanager_system.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/qt/qt_vmmanager_system.cpp b/src/qt/qt_vmmanager_system.cpp index 72d6f2eea..61c52b1b0 100644 --- a/src/qt/qt_vmmanager_system.cpp +++ b/src/qt/qt_vmmanager_system.cpp @@ -622,10 +622,12 @@ VMManagerSystem::setupVars() { display_table[Display::Name::Video].append(tr("IBM PS/55 Display Adapter Graphics").prepend(VMManagerDetailSection::sectionSeparator)); // Voodoo + QString voodoo_name = ""; if (video_config.contains("voodoo") && (video_config["voodoo"].toInt() != 0)) { - auto voodoo_config = getCategory(DeviceConfig::DeviceName(&voodoo_device, "voodoo", 0)); + char temp[512]; + device_get_name(&voodoo_device, 0, temp); + auto voodoo_config = getCategory(QString(temp)); int voodoo_type = voodoo_config["type"].toInt(); - QString voodoo_name; switch (voodoo_type) { case 0: default: @@ -638,8 +640,8 @@ VMManagerSystem::setupVars() { voodoo_name = tr("3Dfx Voodoo 2"); break; } - display_table[Display::Name::Voodoo] = voodoo_name; } + display_table[Display::Name::Voodoo] = voodoo_name; // Drives // First the number of disks @@ -1028,12 +1030,13 @@ VMManagerSystem::setupVars() { display_table[Display::Name::Parallel] = (lptFinal.empty() ? tr("None") : lptFinal.join((hasLptDevices ? VMManagerDetailSection::sectionSeparator : ", "))); // ISA RTC + QString isartc_dev_name = ""; if (other_config.contains("isartc_type")) { auto isartc_internal_name = other_config["isartc_type"]; auto isartc_dev = isartc_get_from_internal_name(isartc_internal_name.toUtf8().data()); - auto isartc_dev_name = DeviceConfig::DeviceName(isartc_get_device(isartc_dev), isartc_get_internal_name(isartc_dev), 0); - display_table[Display::Name::IsaRtc] = isartc_dev_name; + isartc_dev_name = DeviceConfig::DeviceName(isartc_get_device(isartc_dev), isartc_get_internal_name(isartc_dev), 0); } + display_table[Display::Name::IsaRtc] = isartc_dev_name; // ISA RAM QStringList IsaMemCards;