From db358a3de2547e8b31e9d11c8dbeb3c7579bd577 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 14 Apr 2013 13:03:12 +0200 Subject: [PATCH] reloadchannels: make sure that channel flags are updated when reloading Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/bb560fbf473fbbf7c70a8dcb8c2677bd5f83b67b Author: Stefan Seyfried Date: 2013-04-14 (Sun, 14 Apr 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/scan_setup.cpp | 3 +++ src/neutrino.cpp | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index d6639fb79..6047b5579 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -255,6 +255,9 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey) printf("[neutrino] CScanSetup::%s reloadchannels...\n", __FUNCTION__); if (reloadhintBox) 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(); if (reloadhintBox) reloadhintBox->hide(); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index f21efc593..e6060f166 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1557,7 +1557,7 @@ void CNeutrinoApp::SetupFonts() g_fontRenderer->AddFont(font.filename, true); // make italics 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]; 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(); /* lets do it in sync */ reloadhintBox->paint(); + CServiceManager::getInstance()->SaveServices(true, true); g_bouquetManager->saveBouquets(); g_bouquetManager->saveUBouquets(); g_bouquetManager->renumServices(); @@ -3965,7 +3966,7 @@ void CNeutrinoApp::Cleanup() delete RADIOsatList; RADIOsatList = NULL; 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]; g_Font[i] = NULL; }