mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Commit: 12eef31a08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
This commit is contained in:
@@ -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 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";
|
||||
|
Reference in New Issue
Block a user