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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: bd2e18efae
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-08 (Thu, 08 Sep 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-08 00:35:31 +02:00
parent 9196eef83b 5fa17bbd95
commit 3ae9e5c777
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/lua/lua_api_version.h
View File

@@ -4,4 +4,4 @@
* to luainstance.h changes
*/
#define LUA_API_VERSION_MAJOR 1
#define LUA_API_VERSION_MINOR 57
#define LUA_API_VERSION_MINOR 58

11
src/gui/lua/lua_stringinput.cpp
View File

@@ -90,8 +90,17 @@ int CLuaInstStringInput::StringInputExec(lua_State *L)
lua_Integer sms = 0;
tableLookup(L, "sms", sms);
lua_Integer pin = 0;
tableLookup(L, "pin", pin);
if (sms && pin)
dprintf(DEBUG_NORMAL, "[CLuaInstance][%s - %d]: 'sms' AND 'pin' is defined! 'pin' will be prefered.\n", __func__, __LINE__);
CStringInput *i;
if (sms)
if (pin)
i = new CPINInput(name, &value, size,
NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, valid_chars.c_str(), NULL);
else if (sms)
i = new CStringInputSMS(name, &value, size,
NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, valid_chars.c_str(), NULL, icon.c_str());
else