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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d8073b910
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-05-23 17:59:21 +02:00
parent dd4501697b 1e81b5f931
commit 049e4596d3
23 changed files with 121 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/lua/lua_cc_text.cpp
View File

@@ -208,10 +208,11 @@ int CLuaInstCCText::CCTextSetText(lua_State *L)
std::string text = "";
lua_Integer mode = D->mode;
lua_Integer font_text = D->font_text;
tableLookup(L, "text", text);
tableLookup(L, "mode", mode);
tableLookup(L, "font_text", font_text);
if (lua_istable(L, -1)){
tableLookup(L, "text", text);
tableLookup(L, "mode", mode);
tableLookup(L, "font_text", font_text);
}
D->ct->setText(text, mode, g_Font[font_text]);
return 0;
}