mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 07:51:11 +02:00
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b6f2568ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-07 (Sat, 07 Oct 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -2109,9 +2109,6 @@ void CChannelList::paintItem(int pos, const bool firstpaint)
|
||||
}
|
||||
if (!firstpaint && curr == selected)
|
||||
updateVfd();
|
||||
//NI lcd4l-support
|
||||
if(g_settings.lcd4l_support)
|
||||
LCD4l->CreateFile("/tmp/lcd/menu", chan->getName().c_str(), g_settings.lcd4l_convert);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2135,6 +2132,10 @@ void CChannelList::updateVfd()
|
||||
CVFD::getInstance()->showMenuText(0, nameAndDescription, -1, true); // UTF-8
|
||||
} else
|
||||
CVFD::getInstance()->showMenuText(0, chan->getName().c_str(), -1, true); // UTF-8
|
||||
|
||||
//NI lcd4l-support
|
||||
if (g_settings.lcd4l_support)
|
||||
LCD4l->CreateFile("/tmp/lcd/menu", chan->getName().c_str(), g_settings.lcd4l_convert);
|
||||
}
|
||||
|
||||
void CChannelList::paint()
|
||||
|
Reference in New Issue
Block a user