From d2c628bf7927537f9ab83028f2473b2c09a61cd3 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Thu, 16 Feb 2012 07:42:50 +0000 Subject: [PATCH] Fix 2097 and 2106: CBouquetList::Bouquets is vector of pointers, if hdBouquet added, it cannot be deleted git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2108 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/e18ce86df7fa03375316add3ed6936061a264586 Author: [CST] Focus Date: 2012-02-16 (Thu, 16 Feb 2012) --- src/neutrino.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index f7ca2f540..2f9f678d0 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1293,6 +1293,8 @@ void CNeutrinoApp::channelsInit(bool bOnly) if(g_settings.make_hd_list && hi) TVfavList->Bouquets.push_back(hdBouquet); + else + delete hdBouquet; /* Favorites and provides RADIO bouquets */ bnum = 0; @@ -1321,9 +1323,6 @@ void CNeutrinoApp::channelsInit(bool bOnly) myinfo.arena, myinfo.arena / 1024, myinfo.uordblks); #endif - if(g_settings.make_hd_list) - delete hdBouquet; - reloadhintBox->hide(); }