Adding upstream version 0.38.0.upstream/0.38.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 5 deletions

diff --git a/player/lua.c b/player/lua.c
index 41fd520..6354769 100644
--- a/player/lua.c
+++ b/player/lua.c
@@ -61,6 +61,9 @@ static const char * const builtin_lua_scripts[][2] = {
     {"mp.assdraw",
 #   include "player/lua/assdraw.lua.inc"
     },
+    {"mp.input",
+#   include "player/lua/input.lua.inc"
+    },
     {"mp.options",
 #   include "player/lua/options.lua.inc"
     },
@@ -509,7 +512,7 @@ static int script_log(lua_State *L)
         const char *s = lua_tostring(L, -1);
         if (s == NULL)
             return luaL_error(L, "Invalid argument");
-        mp_msg(ctx->log, msgl, "%s%s", s, i > 0 ? " " : "");
+        mp_msg(ctx->log, msgl, (i == 2 ? "%s" : " %s"), s);
         lua_pop(L, 1);  // args... tostring
     }
     mp_msg(ctx->log, msgl, "\n");
@@ -1184,11 +1187,11 @@ static int script_format_json(lua_State *L, void *tmp)
     char *dst = talloc_strdup(tmp, "");
     if (json_write(&dst, &node) >= 0) {
         lua_pushstring(L, dst);
-        lua_pushnil(L);
-    } else {
-        lua_pushnil(L);
-        lua_pushstring(L, "error");
+        return 1;
     }
+
+    lua_pushnil(L);
+    lua_pushstring(L, "error");
     return 2;
 }