From 0d281354650ddc4ca2524d25cb52c4181d073fc7 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Mon, 3 Nov 2014 16:24:28 -0400 Subject: [PATCH] Fixed love.joystick.loadGamepadMappings to work properly if a FileData object is passed to it. --- src/modules/joystick/wrap_JoystickModule.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/modules/joystick/wrap_JoystickModule.cpp b/src/modules/joystick/wrap_JoystickModule.cpp index f70c291ce..803b5bae7 100644 --- a/src/modules/joystick/wrap_JoystickModule.cpp +++ b/src/modules/joystick/wrap_JoystickModule.cpp @@ -179,13 +179,17 @@ int w_getGamepadMapping(lua_State *L) int w_loadGamepadMappings(lua_State *L) { - lua_pushvalue(L, 1); - luax_convobj(L, -1, "filesystem", "isFile"); - bool isfile = luax_toboolean(L, -1); - lua_pop(L, 1); - + bool isfile = true; std::string mappings; + if (lua_isstring(L, 1)) + { + lua_pushvalue(L, 1); + luax_convobj(L, -1, "filesystem", "isFile"); + isfile = luax_toboolean(L, -1); + lua_pop(L, 1); + } + if (isfile) { love::filesystem::FileData *fd = love::filesystem::luax_getfiledata(L, 1);