mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 18:31:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'broken/next-cc'

Browse Source
This commit is contained in:
Stefan Seyfried
2014-01-28 13:22:00 +01:00
parent e9bc524562 828f9e5856
commit 65437a60a8
10 changed files with 79 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/luainstance.cpp
View File

@@ -763,7 +763,7 @@ int CLuaMenuForwarder::exec(CMenuTarget* /*parent*/, const std::string & /*actio
lua_pushstring(L, luaId.c_str());
int status = lua_pcall(L, 1 /* one arg */, 1 /* one result */, 0);
if (status) {
fprintf(stderr, "[CLuaInstance::%s] error in script: %s\n", __func__, lua_tostring(L, -1));
fprintf(stderr, "[CLuaMenuForwarder::%s] error in script: %s\n", __func__, lua_tostring(L, -1));
ShowMsg2UTF("Lua script error:", lua_tostring(L, -1), CMsgBox::mbrBack, CMsgBox::mbBack);
}
if (lua_isnumber(L, -1))
@@ -915,6 +915,10 @@ int CLuaInstance::MenuAddItem(lua_State *L)
std::string type; tableLookup(L, "type", type);
if (type == "back") {
m->m->addItem(GenericMenuBack);
} else if (type == "next") {
m->m->addItem(GenericMenuNext);
} else if (type == "cancel") {
m->m->addItem(GenericMenuCancel);
} else if (type == "separator") {
m->m->addItem(GenericMenuSeparator);
} else if (type == "separatorline") {