diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2018-08-06 00:30:11 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2018-08-06 00:30:13 -0400 |
commit | 25f32d22df6f5c8eb587b4e9444e51786e6702b2 (patch) | |
tree | c85ca1b86618d9854bb0e6e6bb2db5d9ad2173c5 /src/osd | |
parent | c167f8a1fe5cc722d6db74d3f01990136c0a1706 (diff) |
Fix debug assert failure when using SDL fullscreen toggle (nw)
Diffstat (limited to 'src/osd')
-rw-r--r-- | src/osd/modules/input/input_sdlcommon.cpp | 3 | ||||
-rw-r--r-- | src/osd/sdl/window.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/osd/modules/input/input_sdlcommon.cpp b/src/osd/modules/input/input_sdlcommon.cpp index e016b40ee49..a5982ea891d 100644 --- a/src/osd/modules/input/input_sdlcommon.cpp +++ b/src/osd/modules/input/input_sdlcommon.cpp @@ -79,7 +79,8 @@ void sdl_event_manager::process_window_event(running_machine &machine, SDL_Event if (window == nullptr) { - osd_printf_warning("Skipped window event due to missing window param from SDL\n"); + // This condition may occur when the fullscreen toggle is used + osd_printf_verbose("Skipped window event due to missing window param from SDL\n"); return; } diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp index ba805e517ec..e7ef73f4edc 100644 --- a/src/osd/sdl/window.cpp +++ b/src/osd/sdl/window.cpp @@ -297,7 +297,6 @@ void sdl_window_info::toggle_full_screen() machine().ui().menu_reset(); // kill off the drawers renderer_reset(); -// set_platform_window(nullptr); bool is_osx = false; #ifdef SDLMAME_MACOSX // FIXME: This is weird behaviour and certainly a bug in SDL @@ -310,6 +309,7 @@ void sdl_window_info::toggle_full_screen() SDL_SetWindowFullscreen(platform_window(), SDL_WINDOW_FULLSCREEN); // Try to set mode } SDL_DestroyWindow(platform_window()); + set_platform_window(nullptr); downcast<sdl_osd_interface &>(machine().osd()).release_keys(); |