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

Merge remote-tracking branch 'neutrino-mp/master' into pu/mp

Browse Source 
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp
This commit is contained in:
svenhoefer
2017-03-13 16:14:33 +01:00
parent 5b0faeab8c 40adaa6515
commit 8bdb16cec6
181 changed files with 6320 additions and 987 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/widget/menue.cpp
View File

@@ -792,7 +792,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
paint();
break;
}
frameBuffer->blit();
continue;
}
for (unsigned int i= 0; i< items.size(); i++) {
@@ -2354,6 +2353,7 @@ bool CZapProtection::check()
hint = NONEXISTANT_LOCALE;
int res;
std::string cPIN;
char systemstr[128];
do
{
cPIN = "";
@@ -2362,10 +2362,11 @@ bool CZapProtection::check()
res = PINInput->exec(getParent(), "");
delete PINInput;
if (!access(CONFIGDIR "/pinentered.sh", X_OK)) {
std::string systemstr = CONFIGDIR "/pinentered.sh " + cPIN;
system(systemstr.c_str());
}
cPIN[4] = 0;
strcpy(systemstr, CONFIGDIR "/pinentered.sh ");
strcat(systemstr, cPIN.c_str());
system(systemstr);
hint = LOCALE_PINPROTECTION_WRONGCODE;
} while ( (cPIN != *validPIN) && !cPIN.empty() &&
( res == menu_return::RETURN_REPAINT ) &&