Browse Source

Don't error when love.joystick.loadGamepadMappings is given an empty string/file, since saveGamepadMappings can produce that. Resolves issue #1375.

Alex Szpakowski 7 years ago
parent
commit
53872d813a
1 changed files with 3 additions and 1 deletions
  1. 3 1
      src/modules/joystick/sdl/JoystickModule.cpp

+ 3 - 1
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.");
 }