diff options
| author | 2023-12-30 14:58:58 -0500 | |
|---|---|---|
| committer | 2023-12-30 14:58:58 -0500 | |
| commit | f6ee53af145bf320d9cbc17c623ef853e4c2a198 (patch) | |
| tree | 7230dec17460aebdb4a698677b11a36c69bc0c15 | |
| parent | Merge pull request #12521 from ReillyBrogan/fix-wayland-appid (diff) | |
| parent | yuzu_cmd: Report more SDL errors (diff) | |
| download | yuzu-f6ee53af145bf320d9cbc17c623ef853e4c2a198.tar.gz yuzu-f6ee53af145bf320d9cbc17c623ef853e4c2a198.tar.xz yuzu-f6ee53af145bf320d9cbc17c623ef853e4c2a198.zip | |
Merge pull request #12527 from DCNick3/log-more-sdl-errors
Report more SDL errors
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index 5153cdb79..1a35d471c 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | |||
| @@ -20,7 +20,7 @@ EmuWindow_SDL2::EmuWindow_SDL2(InputCommon::InputSubsystem* input_subsystem_, Co | |||
| 20 | : input_subsystem{input_subsystem_}, system{system_} { | 20 | : input_subsystem{input_subsystem_}, system{system_} { |
| 21 | input_subsystem->Initialize(); | 21 | input_subsystem->Initialize(); |
| 22 | if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) < 0) { | 22 | if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_GAMECONTROLLER) < 0) { |
| 23 | LOG_CRITICAL(Frontend, "Failed to initialize SDL2! Exiting..."); | 23 | LOG_CRITICAL(Frontend, "Failed to initialize SDL2: {}, Exiting...", SDL_GetError()); |
| 24 | exit(1); | 24 | exit(1); |
| 25 | } | 25 | } |
| 26 | SDL_SetMainReady(); | 26 | SDL_SetMainReady(); |
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp index 9ed47d453..8b916f05c 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp | |||
| @@ -28,7 +28,8 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsyste | |||
| 28 | SDL_SysWMinfo wm; | 28 | SDL_SysWMinfo wm; |
| 29 | SDL_VERSION(&wm.version); | 29 | SDL_VERSION(&wm.version); |
| 30 | if (SDL_GetWindowWMInfo(render_window, &wm) == SDL_FALSE) { | 30 | if (SDL_GetWindowWMInfo(render_window, &wm) == SDL_FALSE) { |
| 31 | LOG_CRITICAL(Frontend, "Failed to get information from the window manager"); | 31 | LOG_CRITICAL(Frontend, "Failed to get information from the window manager: {}", |
| 32 | SDL_GetError()); | ||
| 32 | std::exit(EXIT_FAILURE); | 33 | std::exit(EXIT_FAILURE); |
| 33 | } | 34 | } |
| 34 | 35 | ||