From e50463e9833b94ba50589228f773893b2202639a Mon Sep 17 00:00:00 2001 From: Arisotura Date: Mon, 20 May 2024 00:04:05 +0200 Subject: [PATCH] finally, it builds (don't get your hopes up. it crashes) --- src/frontend/qt_sdl/Window.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/frontend/qt_sdl/Window.cpp b/src/frontend/qt_sdl/Window.cpp index 5304a3e9..34d4a8f8 100644 --- a/src/frontend/qt_sdl/Window.cpp +++ b/src/frontend/qt_sdl/Window.cpp @@ -612,7 +612,7 @@ MainWindow::MainWindow(EmuInstance* inst, QWidget* parent) : QMainWindow(parent) actEjectCart->setEnabled(false); actEjectGBACart->setEnabled(false); - if (Config::ConsoleType == 1) + if (emuInstance->globalCfg.GetInt("Emu.ConsoleType") == 1) { actInsertGBACart->setEnabled(false); for (int i = 0; i < 1; i++) @@ -636,7 +636,7 @@ MainWindow::MainWindow(EmuInstance* inst, QWidget* parent) : QMainWindow(parent) actPowerManagement->setEnabled(false); actSetupCheats->setEnabled(false); - actTitleManager->setEnabled(!Config::DSiNANDPath.empty()); + actTitleManager->setEnabled(!emuInstance->globalCfg.GetString("DSi.NANDPath").empty()); actEnableCheats->setChecked(Config::EnableCheats); @@ -1164,7 +1164,7 @@ void MainWindow::updateCartInserted(bool gba) bool inserted; if (gba) { - inserted = emuInstance->gbaCartInserted() && (Config::ConsoleType == 0); + inserted = emuInstance->gbaCartInserted() && (emuInstance->globalCfg.GetInt("Emu.ConsoleType") == 0); actCurrentGBACart->setText("GBA slot: " + emuInstance->gbaCartLabel()); actEjectGBACart->setEnabled(inserted); } @@ -1696,7 +1696,7 @@ void MainWindow::onEmuSettingsDialogFinished(int res) { emuThread->emuUnpause(); - if (Config::ConsoleType == 1) + if (emuInstance->globalCfg.GetInt("Emu.ConsoleType") == 1) { actInsertGBACart->setEnabled(false); for (int i = 0; i < 1; i++) @@ -1717,7 +1717,7 @@ void MainWindow::onEmuSettingsDialogFinished(int res) actCurrentGBACart->setText("GBA slot: " + emuInstance->gbaCartLabel()); if (!RunningSomething) - actTitleManager->setEnabled(!Config::DSiNANDPath.empty()); + actTitleManager->setEnabled(!emuInstance->globalCfg.GetString("DSi.NANDPath").empty()); } void MainWindow::onOpenInputConfig() @@ -2067,7 +2067,7 @@ void MainWindow::onEmuStop() actDateTime->setEnabled(true); actPowerManagement->setEnabled(false); - actTitleManager->setEnabled(!Config::DSiNANDPath.empty()); + actTitleManager->setEnabled(!emuInstance->globalCfg.GetString("DSi.NANDPath").empty()); } void MainWindow::onUpdateVideoSettings(bool glchange)