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

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

Browse Source 
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 55743aff0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-15 23:39:43 +01:00
parent ca99393430 9da6d922dd
commit 45f0ad7d7e
42 changed files with 241 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -851,8 +851,11 @@ std::string CNeutrinoYParser::func_get_partition_list(CyhookHandler *, std::str
std::string CNeutrinoYParser::func_get_boxtype(CyhookHandler *, std::string)
{
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 */
if ((boxname.compare("Neo") == 0) && (CFEManager::getInstance()->getFrontendCount() > 1))
boxname += " Twin";