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

Merge branch 'master' into pu/mp

Browse Source
This commit is contained in:
svenhoefer
2017-03-14 08:06:05 +01:00
parent a3bd6bb4de 4bf9c74f59
commit f498775647
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -3,6 +3,7 @@ Makefile
autom4te.cache autom4te.cache
*.in *.in
aclocal.m4 aclocal.m4
compile
config.* config.*
configure configure
depcomp depcomp

12
.svnignore
View File

@@ -1,12 +0,0 @@
autom4te.cache
*.in
aclocal.m4
config.*
configure
depcomp
install-sh
*.pc
libtool
ltmain.sh
missing
stamp.h1

5
src/nhttpd/tuxboxapi/neutrinoyparser.cpp
View File

@@ -839,8 +839,11 @@ std::string CNeutrinoYParser::func_get_partition_list(CyhookHandler *, std::str
std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string) std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
{ {
std::string boxvendor(g_info.hw_caps->boxvendor); std::string boxvendor(g_info.hw_caps->boxvendor);
std::string boxname(g_info.hw_caps->boxname); /* stay compatible with present code in Y_Blocks.txt */
if (boxvendor.compare("Coolstream") == 0)
boxvendor = "CST";
std::string boxname(g_info.hw_caps->boxname);
/* workaround for Neo2 */ /* workaround for Neo2 */
if ((boxname.compare("Neo") == 0) && (CFEManager::getInstance()->getFrontendCount() > 1)) if ((boxname.compare("Neo") == 0) && (CFEManager::getInstance()->getFrontendCount() > 1))
boxname += " Twin"; boxname += " Twin";