mirror of
https://github.com/melonDS-emu/melonDS.git
synced 2025-07-23 14:19:55 -06:00
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.
This commit is contained in:
@ -2797,7 +2797,11 @@ int main(int argc, char** argv)
|
|||||||
{
|
{
|
||||||
printf("SDL couldn't init rumble\n");
|
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 :(");
|
QMessageBox::critical(NULL, "melonDS", "SDL shat itself :(");
|
||||||
return 1;
|
return 1;
|
||||||
|
Reference in New Issue
Block a user