From 2245d87875e7c7595acfb86b19c55fe6d802ba6e Mon Sep 17 00:00:00 2001 From: thrust26 Date: Thu, 2 Jul 2020 09:33:16 +0200 Subject: [PATCH] suppress fullscreen mode switches in Time Machine mode (fixes #670) --- src/emucore/FrameBuffer.cxx | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx index f2c3fc8f6..6ae234fa0 100644 --- a/src/emucore/FrameBuffer.cxx +++ b/src/emucore/FrameBuffer.cxx @@ -992,21 +992,33 @@ void FrameBuffer::setFullscreen(bool enable) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void FrameBuffer::toggleFullscreen(bool toggle) { - const bool isFullscreen = toggle ? !fullScreen() : fullScreen(); - - setFullscreen(isFullscreen); - - if(myBufferType == BufferType::Emulator) + switch (myOSystem.eventHandler().state()) { - ostringstream msg; + case EventHandlerState::LAUNCHER: + case EventHandlerState::EMULATION: + case EventHandlerState::PAUSE: + case EventHandlerState::DEBUGGER: + { + const bool isFullscreen = toggle ? !fullScreen() : fullScreen(); - msg << "Fullscreen "; - if(isFullscreen) - msg << "enabled (" << refreshRate() << " Hz)"; - else - msg << "disabled"; + setFullscreen(isFullscreen); - showMessage(msg.str()); + if (myBufferType != BufferType::Launcher) + { + ostringstream msg; + + msg << "Fullscreen "; + if (isFullscreen) + msg << "enabled (" << refreshRate() << " Hz)"; + else + msg << "disabled"; + + showMessage(msg.str()); + } + break; + } + default: + break; } }