From 151610eb6c0ec89e3947f0d85796e27c5868903e Mon Sep 17 00:00:00 2001
From: andrigamerita <37557992+andrigamerita@users.noreply.github.com>
Date: Wed, 1 Dec 2021 13:52:58 +0100
Subject: Treat SDL_INIT_JOYSTICK fail as non-critical (#1277)

Treating the fail of SDL_INIT_JOYSTICK as non-critical, because on some systems that SDL feature can for some reason fail. This leads to the emulator closing with a critical error, even though it would work perfectly fine with just a keyboard.
---
 src/frontend/qt_sdl/main.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp
index 64a0a90..0447cbb 100644
--- a/src/frontend/qt_sdl/main.cpp
+++ b/src/frontend/qt_sdl/main.cpp
@@ -2797,7 +2797,11 @@ int main(int argc, char** argv)
     {
         printf("SDL couldn't init rumble\n");
     }
-    if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK) < 0)
+    if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
+    {
+        printf("SDL couldn't init joystick\n");
+    }
+    if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0)
     {
         QMessageBox::critical(NULL, "melonDS", "SDL shat itself :(");
         return 1;
-- 
cgit v1.2.3