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

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

Browse Source 
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-28 16:55:39 +01:00
parent dff4ea2892 bf56f9f0bc
commit 5e5451332e
27 changed files with 348 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/infoviewer_bb.cpp
View File

@@ -475,7 +475,7 @@ void CInfoViewerBB::showBBIcons(const int modus, const std::string & icon)
}
}
void CInfoViewerBB::paintshowButtonBar()
void CInfoViewerBB::paintshowButtonBar(bool noTimer/*=false*/)
{
if (!is_visible)
return;
@@ -483,7 +483,9 @@ void CInfoViewerBB::paintshowButtonBar()
for (int i = 0; i < CInfoViewerBB::BUTTON_MAX; i++) {
tmp_bbButtonInfoText[i] = "";
}
g_InfoViewer->sec_timer_id = g_RCInput->addTimer(1*1000*1000, false);
if (!noTimer)
g_InfoViewer->sec_timer_id = g_RCInput->addTimer(1*1000*1000, false);
if (g_settings.infobar_casystem_display < 2)
paint_ca_bar();