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

reloadchannels: make sure that channel flags are updated when reloading

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: bb560fbf47
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-04-14 13:03:12 +02:00
committed by [CST] Focus
parent d9d926d7e2
commit db358a3de2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/scan_setup.cpp
View File

@@ -255,6 +255,9 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey)
printf("[neutrino] CScanSetup::%s reloadchannels...\n", __FUNCTION__); printf("[neutrino] CScanSetup::%s reloadchannels...\n", __FUNCTION__);
if (reloadhintBox) if (reloadhintBox)
reloadhintBox->paint(); reloadhintBox->paint();
/* save if changed, to make sure NEW/REMOVED/... flags are updated */
CServiceManager::getInstance()->SaveServices(true, true);
/* Z->reinitChannels triggers EVT_SERVICESCHANGED and this triggers channelsInit() */
g_Zapit->reinitChannels(); g_Zapit->reinitChannels();
if (reloadhintBox) if (reloadhintBox)
reloadhintBox->hide(); reloadhintBox->hide();

5
src/neutrino.cpp
View File

@@ -1557,7 +1557,7 @@ void CNeutrinoApp::SetupFonts()
g_fontRenderer->AddFont(font.filename, true); // make italics g_fontRenderer->AddFont(font.filename, true); // make italics
style[2] = "Italic"; style[2] = "Italic";
for (int i = 0; i < FONT_TYPE_COUNT; i++) for (int i = 0; i < SNeutrinoSettings::FONT_TYPE_COUNT; i++)
{ {
if(g_Font[i]) delete g_Font[i]; if(g_Font[i]) delete g_Font[i];
g_Font[i] = g_fontRenderer->getFont(font.name, style[neutrino_font[i].style], configfile.getInt32(locale_real_names[neutrino_font[i].name], neutrino_font[i].defaultsize) + neutrino_font[i].size_offset * font.size_offset); g_Font[i] = g_fontRenderer->getFont(font.name, style[neutrino_font[i].style], configfile.getInt32(locale_real_names[neutrino_font[i].name], neutrino_font[i].defaultsize) + neutrino_font[i].size_offset * font.size_offset);
@@ -2424,6 +2424,7 @@ _repeat:
//g_Zapit->saveBouquets(); //g_Zapit->saveBouquets();
/* lets do it in sync */ /* lets do it in sync */
reloadhintBox->paint(); reloadhintBox->paint();
CServiceManager::getInstance()->SaveServices(true, true);
g_bouquetManager->saveBouquets(); g_bouquetManager->saveBouquets();
g_bouquetManager->saveUBouquets(); g_bouquetManager->saveUBouquets();
g_bouquetManager->renumServices(); g_bouquetManager->renumServices();
@@ -3965,7 +3966,7 @@ void CNeutrinoApp::Cleanup()
delete RADIOsatList; RADIOsatList = NULL; delete RADIOsatList; RADIOsatList = NULL;
printf("cleanup 1\n");fflush(stdout); printf("cleanup 1\n");fflush(stdout);
for (int i = 0; i < FONT_TYPE_COUNT; i++) { for (int i = 0; i < SNeutrinoSettings::FONT_TYPE_COUNT; i++) {
delete g_Font[i]; delete g_Font[i];
g_Font[i] = NULL; g_Font[i] = NULL;
} }