summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Nikita Strygin2023-12-30 13:18:42 +0300
committerGravatar Nikita Strygin2023-12-30 13:32:33 +0300
commit9323a1f9b20e9ff9d02ba75baba4e43df5eee0e6 (patch)
tree20feb7f8587298a8d6636589324f0ef0664d6dc6
parentMerge pull request #12455 from liamwhite/end-wait (diff)
downloadyuzu-9323a1f9b20e9ff9d02ba75baba4e43df5eee0e6.tar.gz
yuzu-9323a1f9b20e9ff9d02ba75baba4e43df5eee0e6.tar.xz
yuzu-9323a1f9b20e9ff9d02ba75baba4e43df5eee0e6.zip
yuzu_cmd: Report more SDL errors
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2.cpp2
-rw-r--r--src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp3
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