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

CLuaInstance::runScript: Set script parameter 0 to 'script name'...

Browse Source 
...for compatibility with standalone lua scripts
This commit is contained in:
M. Liebmann
2014-03-19 15:15:02 +01:00
parent 0a957abf31
commit b80e7480a2
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/luainstance.cpp
View File

@@ -339,16 +339,24 @@ void CLuaInstance::runScript(const char *fileName, std::vector<std::string> *arg
*error_string = std::string(lua_tostring(lua, -1));
return;
}
int argvSize = 1;
int n = 0;
set_lua_variables(lua);
if (argv && (!argv->empty()))
argvSize += argv->size();
lua_createtable(lua, argvSize, 0);
// arg0 is scriptname
lua_pushstring(lua, fileName);
lua_rawseti(lua, -2, n++);
if (argv && (!argv->empty())) {
lua_createtable(lua, argv->size(), 0);
int n = 0;
for(std::vector<std::string>::iterator it = argv->begin(); it != argv->end(); ++it) {
lua_pushstring(lua, it->c_str());
lua_rawseti(lua, -2, n++);
}
lua_setglobal(lua, "arg");
}
lua_setglobal(lua, "arg");
status = lua_pcall(lua, 0, LUA_MULTRET, 0);
if (result_code)
*result_code = to_string(status);