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

Merge branch 'ni/mp' into ni/cst-next

Browse Source 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-26 19:13:47 +02:00
parent 8f2cbeb841 73da438ec4
commit af8fe3ebc6
220 changed files with 7577 additions and 1615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -820,7 +820,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
paint();
break;
}
frameBuffer->blit();
continue;
}
for (unsigned int i= 0; i< items.size(); i++) {
@@ -2373,6 +2372,7 @@ bool CZapProtection::check()
hint = NONEXISTANT_LOCALE;
int res;
std::string cPIN;
char systemstr[128];
do
{
cPIN = "";
@@ -2381,10 +2381,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 ) &&