fixed missing prefix for "thumb.trapfatal"

This commit is contained in:
thrust26 2018-05-08 21:29:29 +02:00
parent 1bb3790e12
commit 1c10e590af
3 changed files with 6 additions and 3 deletions

View File

@ -64,9 +64,10 @@ CartridgeBUS::CartridgeBUS(const BytePtr& image, uInt32 size,
myDisplayImage = myBUSRAM + DSRAM; myDisplayImage = myBUSRAM + DSRAM;
// Create Thumbulator ARM emulator // Create Thumbulator ARM emulator
string prefix = settings.getBool("dev.settings") ? "plr." : "dev.";
myThumbEmulator = make_unique<Thumbulator>( myThumbEmulator = make_unique<Thumbulator>(
reinterpret_cast<uInt16*>(myImage), reinterpret_cast<uInt16*>(myBUSRAM), reinterpret_cast<uInt16*>(myImage), reinterpret_cast<uInt16*>(myBUSRAM),
settings.getBool("thumb.trapfatal"), Thumbulator::ConfigureFor::BUS, this settings.getBool(prefix + "thumb.trapfatal"), Thumbulator::ConfigureFor::BUS, this
); );
setInitialState(); setInitialState();

View File

@ -67,9 +67,10 @@ CartridgeCDF::CartridgeCDF(const BytePtr& image, uInt32 size,
setVersion(); setVersion();
// Create Thumbulator ARM emulator // Create Thumbulator ARM emulator
string prefix = settings.getBool("dev.settings") ? "plr." : "dev.";
myThumbEmulator = make_unique<Thumbulator>( myThumbEmulator = make_unique<Thumbulator>(
reinterpret_cast<uInt16*>(myImage), reinterpret_cast<uInt16*>(myCDFRAM), reinterpret_cast<uInt16*>(myImage), reinterpret_cast<uInt16*>(myCDFRAM),
settings.getBool("thumb.trapfatal"), myVersion ? settings.getBool(prefix + "thumb.trapfatal"), myVersion ?
Thumbulator::ConfigureFor::CDF1 : Thumbulator::ConfigureFor::CDF, this); Thumbulator::ConfigureFor::CDF1 : Thumbulator::ConfigureFor::CDF, this);
setInitialState(); setInitialState();

View File

@ -53,10 +53,11 @@ CartridgeDPCPlus::CartridgeDPCPlus(const BytePtr& image, uInt32 size,
myFrequencyImage = myDisplayImage + 0x1000; myFrequencyImage = myDisplayImage + 0x1000;
// Create Thumbulator ARM emulator // Create Thumbulator ARM emulator
string prefix = settings.getBool("dev.settings") ? "plr." : "dev.";
myThumbEmulator = make_unique<Thumbulator> myThumbEmulator = make_unique<Thumbulator>
(reinterpret_cast<uInt16*>(myImage), (reinterpret_cast<uInt16*>(myImage),
reinterpret_cast<uInt16*>(myDPCRAM), reinterpret_cast<uInt16*>(myDPCRAM),
settings.getBool("thumb.trapfatal"), settings.getBool(prefix + "thumb.trapfatal"),
Thumbulator::ConfigureFor::DPCplus, Thumbulator::ConfigureFor::DPCplus,
this); this);