mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
Rework display LOCALE_SERVICEMENU_RELOAD_HINT message
- remove the very short visible message in channelsInit()
- remove global reloadhintBox
Signed-off-by: Thilo Graf <dbt@novatux.de>
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8eab1ca472
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-07-26 (Sat, 26 Jul 2014)
------------------
This commit was generated by Migit
This commit is contained in:
committed by
[CST] Focus
parent
01b2ed34e6
commit
bd9a4f50b6
@@ -127,7 +127,6 @@
|
||||
#include <eitd/sectionsd.h>
|
||||
|
||||
int old_b_id = -1;
|
||||
CHintBox * reloadhintBox = 0;
|
||||
|
||||
CInfoClock *InfoClock;
|
||||
int allow_flash = 1;
|
||||
@@ -1336,10 +1335,6 @@ void CNeutrinoApp::channelsInit(bool bOnly)
|
||||
printf("[neutrino] Creating channels lists...\n");
|
||||
TIMER_START();
|
||||
|
||||
if(!reloadhintBox)
|
||||
reloadhintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_SERVICEMENU_RELOAD_HINT));
|
||||
reloadhintBox->paint();
|
||||
|
||||
memset(tvsort, -1, sizeof(tvsort));
|
||||
memset(radiosort, -1, sizeof(tvsort));
|
||||
|
||||
@@ -1513,7 +1508,6 @@ void CNeutrinoApp::channelsInit(bool bOnly)
|
||||
SetChannelMode(lastChannelMode);
|
||||
|
||||
dprintf(DEBUG_DEBUG, "\nAll bouquets-channels received\n");
|
||||
reloadhintBox->hide();
|
||||
}
|
||||
|
||||
void CNeutrinoApp::SetChannelMode(int newmode)
|
||||
@@ -2480,12 +2474,14 @@ _repeat:
|
||||
if(old_b_id < 0) old_b_id = old_b;
|
||||
//g_Zapit->saveBouquets();
|
||||
/* lets do it in sync */
|
||||
reloadhintBox->paint();
|
||||
CHintBox chb(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_SERVICEMENU_RELOAD_HINT));
|
||||
chb.paint();
|
||||
CServiceManager::getInstance()->SaveServices(true, true);
|
||||
g_bouquetManager->saveBouquets();
|
||||
g_bouquetManager->saveUBouquets();
|
||||
g_bouquetManager->renumServices();
|
||||
channelsInit(/*true*/);
|
||||
chb.hide();
|
||||
t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
|
||||
channelList->adjustToChannelID(live_channel_id);//FIXME what if deleted ?
|
||||
bouquetList->activateBouquet(old_b_id, false);
|
||||
|
Reference in New Issue
Block a user