From 73a8938abf20982d045d43816b8f1a01d2e8a3b0 Mon Sep 17 00:00:00 2001 From: thrust26 Date: Sat, 18 Nov 2017 18:22:10 +0100 Subject: [PATCH] fixes for developer settings --- src/debugger/gui/RiotWidget.cxx | 5 +++-- src/emucore/Console.cxx | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/debugger/gui/RiotWidget.cxx b/src/debugger/gui/RiotWidget.cxx index 8c8e1f48e..c4195fec5 100644 --- a/src/debugger/gui/RiotWidget.cxx +++ b/src/debugger/gui/RiotWidget.cxx @@ -321,7 +321,7 @@ void RiotWidget::loadConfig() myP1Diff->setSelectedIndex(riot.diffP1()); bool devSettings = instance().settings().getBool("dev.settings"); - myConsole->setText(instance().settings().getString("dev.console") == "7800" ? "Atari 7800" : "Atari 2600"); + myConsole->setText(devSettings && instance().settings().getString("dev.console") == "7800" ? "Atari 7800" : "Atari 2600"); myConsole->setEditable(false, true); myTVType->setSelectedIndex(riot.tvType()); @@ -469,7 +469,8 @@ ControllerWidget* RiotWidget::addControlWidget(GuiObject* boss, const GUI::Font& void RiotWidget::handleConsole() { RiotDebug& riot = instance().debugger().riotDebug(); - bool is7800 = instance().settings().getString("dev.console") == "7800"; + bool devSettings = instance().settings().getBool("dev.settings"); + bool is7800 = devSettings && instance().settings().getString("dev.console") == "7800"; myTVType->setEnabled(!is7800); myPause->setEnabled(is7800); diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx index 7268b41cc..a66af362e 100644 --- a/src/emucore/Console.cxx +++ b/src/emucore/Console.cxx @@ -371,7 +371,6 @@ void Console::toggleColorLoss() bool colorloss = !(devSettings && myOSystem.settings().getBool("dev.colorloss")); if(myTIA->enableColorLoss(colorloss)) { - myOSystem.settings().setValue("dev.colorloss", colorloss); string message = string("PAL color-loss ") + (colorloss ? "enabled" : "disabled"); myOSystem.frameBuffer().showMessage(message);