From 53872d813ab7f989bf148140b52a36d07fe12424 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Wed, 7 Feb 2018 22:32:06 -0400 Subject: [PATCH] Don't error when love.joystick.loadGamepadMappings is given an empty string/file, since saveGamepadMappings can produce that. Resolves issue #1375. --- src/modules/joystick/sdl/JoystickModule.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/joystick/sdl/JoystickModule.cpp b/src/modules/joystick/sdl/JoystickModule.cpp index b1f87f271..e297883f7 100644 --- a/src/modules/joystick/sdl/JoystickModule.cpp +++ b/src/modules/joystick/sdl/JoystickModule.cpp @@ -432,7 +432,9 @@ void JoystickModule::loadGamepadMappings(const std::string &mappings) } } - if (!success) + // Don't error when an empty string is given, since saveGamepadMappings can + // produce an empty string if there are no recently seen gamepads to save. + if (!success && !mappings.empty()) throw love::Exception("Invalid gamepad mappings."); }