mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/gui/luainstance.cpp: Fix copy/paste error in commit 3dfd639

Browse Source 
- Set Lua api version to 1.5


Origin commit data
------------------
Branch: ni/coolstream
Commit: cf4beae892
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-09-19 (Sat, 19 Sep 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2015-09-19 16:50:55 +02:00
parent 7c9b51686c
commit fa24f8e77d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/luainstance.cpp
View File

@@ -1185,7 +1185,7 @@ int CLuaMenuStringinput::exec(CMenuTarget* /*parent*/, const std::string & /*act
lua_remove(L, -2); lua_remove(L, -2);
lua_pushstring(L, luaId.c_str()); lua_pushstring(L, luaId.c_str());
lua_pushstring(L, value->c_str()); lua_pushstring(L, value->c_str());
int status = lua_pcall(L, 1 /* one arg */, 1 /* one result */, 0); int status = lua_pcall(L, 2 /* two arg */, 1 /* one result */, 0);
if (status) { if (status) {
fprintf(stderr, "[CLuaMenuStringinput::%s:%d] error in script: %s\n", __func__, __LINE__, lua_tostring(L, -1)); fprintf(stderr, "[CLuaMenuStringinput::%s:%d] error in script: %s\n", __func__, __LINE__, lua_tostring(L, -1));
luaL_error(L, " => %s", lua_tostring(L, -1)); luaL_error(L, " => %s", lua_tostring(L, -1));
@@ -1218,7 +1218,7 @@ int CLuaMenuKeyboardinput::exec(CMenuTarget* /*parent*/, const std::string & /*a
lua_remove(L, -2); lua_remove(L, -2);
lua_pushstring(L, luaId.c_str()); lua_pushstring(L, luaId.c_str());
lua_pushstring(L, value->c_str()); lua_pushstring(L, value->c_str());
int status = lua_pcall(L, 1 /* one arg */, 1 /* one result */, 0); int status = lua_pcall(L, 2 /* two arg */, 1 /* one result */, 0);
if (status) { if (status) {
fprintf(stderr, "[CLuaMenuKeyboardinput::%s:%d] error in script: %s\n", __func__, __LINE__, lua_tostring(L, -1)); fprintf(stderr, "[CLuaMenuKeyboardinput::%s:%d] error in script: %s\n", __func__, __LINE__, lua_tostring(L, -1));
luaL_error(L, " => %s", lua_tostring(L, -1)); luaL_error(L, " => %s", lua_tostring(L, -1));

2
src/gui/luainstance.h
View File

@@ -34,7 +34,7 @@ extern "C" {
#include <vector> #include <vector>
#define LUA_API_VERSION_MAJOR 1 #define LUA_API_VERSION_MAJOR 1
#define LUA_API_VERSION_MINOR 4 #define LUA_API_VERSION_MINOR 5
/* this is stored as userdata in the lua_State */ /* this is stored as userdata in the lua_State */
struct CLuaData struct CLuaData