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

infoicons: avoid extern CInfoIcons; use getInstance() instead of this

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a34b06137
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- infoicons: avoid extern CInfoIcons; use getInstance() instead of this

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-01-03 10:49:50 +01:00
parent 0043b082c9
commit cfa5aa6414
10 changed files with 25 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/user_menue.cpp
View File

@@ -99,7 +99,6 @@ extern CCAMMenuHandler * g_CamHandler;
#include <gui/infoicons_setup.h>
#include <gui/infoicons.h>
extern CInfoIcons *InfoIcons;
CUserMenu::CUserMenu()
{
@@ -571,7 +570,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
}
CInfoClock::getInstance()->enableInfoClock(false);
InfoIcons->enableInfoIcons(false); //NI
CInfoIcons::getInstance()->enableInfoIcons(false); //NI
// show menu if there are more than 2 items only
// otherwise, we start the item directly (must be the last one)
if (menu_items > 1 )
@@ -580,7 +579,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
last_menu_item->exec( NULL );
CInfoClock::getInstance()->enableInfoClock(true);
InfoIcons->enableInfoIcons(true); //NI
CInfoIcons::getInstance()->enableInfoIcons(true); //NI
CNeutrinoApp::getInstance()->StartSubtitles();
if (button < COL_BUTTONMAX)