diff options
author | Liam <byteslice@airmail.cc> | 2022-06-10 18:49:18 +0200 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2022-06-10 18:49:18 +0200 |
commit | c3cc65a11eddc0a72b31e1c1ff5fae997be21016 (patch) | |
tree | 700ce19fd6f742fca73395b873f958dfd105f354 /src/yuzu_cmd/emu_window | |
parent | core/debugger: fix a number of shutdown deadlocks (diff) | |
download | yuzu-c3cc65a11eddc0a72b31e1c1ff5fae997be21016.tar yuzu-c3cc65a11eddc0a72b31e1c1ff5fae997be21016.tar.gz yuzu-c3cc65a11eddc0a72b31e1c1ff5fae997be21016.tar.bz2 yuzu-c3cc65a11eddc0a72b31e1c1ff5fae997be21016.tar.lz yuzu-c3cc65a11eddc0a72b31e1c1ff5fae997be21016.tar.xz yuzu-c3cc65a11eddc0a72b31e1c1ff5fae997be21016.tar.zst yuzu-c3cc65a11eddc0a72b31e1c1ff5fae997be21016.zip |
Diffstat (limited to 'src/yuzu_cmd/emu_window')
-rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index 71c413e64..8e38724db 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp @@ -162,7 +162,15 @@ void EmuWindow_SDL2::WaitEvent() { SDL_Event event; if (!SDL_WaitEvent(&event)) { - LOG_CRITICAL(Frontend, "SDL_WaitEvent failed: {}", SDL_GetError()); + const char* error = SDL_GetError(); + if (!error || strcmp(error, "") == 0) { + // https://github.com/libsdl-org/SDL/issues/5780 + // Sometimes SDL will return without actually having hit an error condition; + // just ignore it in this case. + return; + } + + LOG_CRITICAL(Frontend, "SDL_WaitEvent failed: {}", error); exit(1); } |