diff options
| author | 2022-06-10 12:49:18 -0400 | |
|---|---|---|
| committer | 2022-06-10 12:49:18 -0400 | |
| commit | c3cc65a11eddc0a72b31e1c1ff5fae997be21016 (patch) | |
| tree | 700ce19fd6f742fca73395b873f958dfd105f354 /src | |
| parent | core/debugger: fix a number of shutdown deadlocks (diff) | |
| download | yuzu-c3cc65a11eddc0a72b31e1c1ff5fae997be21016.tar.gz yuzu-c3cc65a11eddc0a72b31e1c1ff5fae997be21016.tar.xz yuzu-c3cc65a11eddc0a72b31e1c1ff5fae997be21016.zip | |
yuzu-cmd: ignore bogus timeous from SDL
Diffstat (limited to '')
| -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() { | |||
| 162 | SDL_Event event; | 162 | SDL_Event event; |
| 163 | 163 | ||
| 164 | if (!SDL_WaitEvent(&event)) { | 164 | if (!SDL_WaitEvent(&event)) { |
| 165 | LOG_CRITICAL(Frontend, "SDL_WaitEvent failed: {}", SDL_GetError()); | 165 | const char* error = SDL_GetError(); |
| 166 | if (!error || strcmp(error, "") == 0) { | ||
| 167 | // https://github.com/libsdl-org/SDL/issues/5780 | ||
| 168 | // Sometimes SDL will return without actually having hit an error condition; | ||
| 169 | // just ignore it in this case. | ||
| 170 | return; | ||
| 171 | } | ||
| 172 | |||
| 173 | LOG_CRITICAL(Frontend, "SDL_WaitEvent failed: {}", error); | ||
| 166 | exit(1); | 174 | exit(1); |
| 167 | } | 175 | } |
| 168 | 176 | ||