浏览代码

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

Alex Szpakowski 7 年之前
父节点
当前提交
53872d813a
共有 1 个文件被更改,包括 3 次插入1 次删除
  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.");
 }