Prevent debugger attach when we have switched to full-screen.
svn-id: r4125
This commit is contained in:
parent
385c91733e
commit
c60c97b1d4
2 changed files with 3 additions and 2 deletions
|
@ -1171,7 +1171,7 @@ void Scumm::waitForTimer(int msec_delay) {
|
||||||
_fastMode ^= 1;
|
_fastMode ^= 1;
|
||||||
else if (event.kbd.keycode=='g')
|
else if (event.kbd.keycode=='g')
|
||||||
_fastMode ^= 2;
|
_fastMode ^= 2;
|
||||||
else if (event.kbd.keycode=='d')
|
else if ((event.kbd.keycode=='d') && (_fullScreen == false))
|
||||||
g_debugger.attach(this);
|
g_debugger.attach(this);
|
||||||
else if (event.kbd.keycode=='s')
|
else if (event.kbd.keycode=='s')
|
||||||
resourceStats();
|
resourceStats();
|
||||||
|
|
1
sdl.cpp
1
sdl.cpp
|
@ -904,6 +904,7 @@ uint32 OSystem_SDL::property(int param, uint32 value) {
|
||||||
|
|
||||||
case PROP_TOGGLE_FULLSCREEN:
|
case PROP_TOGGLE_FULLSCREEN:
|
||||||
_full_screen ^= true;
|
_full_screen ^= true;
|
||||||
|
g_scumm->_fullScreen = _full_screen;
|
||||||
|
|
||||||
if (!SDL_WM_ToggleFullScreen(sdl_hwscreen)) {
|
if (!SDL_WM_ToggleFullScreen(sdl_hwscreen)) {
|
||||||
/* if ToggleFullScreen fails, achieve the same effect with hotswap gfx mode */
|
/* if ToggleFullScreen fails, achieve the same effect with hotswap gfx mode */
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue