ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid crash if strict mode is enabled, console is reloaded and linking fails.

This commit is contained in:
Christian Speckner 2024-08-21 23:09:32 +02:00
parent 53d239c7e5
commit 7644ba6fa8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emucore/EventHandler.cxx
View File

@ -1518,7 +1518,9 @@ void EventHandler::handleEvent(Event::Type event, Int32 value, bool repeated)
return; return;
case Event::ReloadConsole: case Event::ReloadConsole:
if(pressed && !repeated) myOSystem.reloadConsole(true); if(pressed && !repeated && !myOSystem.reloadConsole(true))
setState(EventHandlerState::LAUNCHER);
return; return;
case Event::PreviousMultiCartRom: case Event::PreviousMultiCartRom:

1
src/emucore/OSystem.cxx
View File

@ -967,6 +967,7 @@ void OSystem::mainLoop()
const bool wasEmulation = myEventHandler->state() == EventHandlerState::EMULATION; const bool wasEmulation = myEventHandler->state() == EventHandlerState::EMULATION;
myEventHandler->poll(TimerManager::getTicks()); myEventHandler->poll(TimerManager::getTicks());
if(myQuitLoop) break; // Exit if the user wants to quit if(myQuitLoop) break; // Exit if the user wants to quit
if (!wasEmulation && myEventHandler->state() == EventHandlerState::EMULATION) { if (!wasEmulation && myEventHandler->state() == EventHandlerState::EMULATION) {