From a045a6690cdfa83ec93a847ff10de69b674022d6 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 6 Apr 2013 16:58:19 +0200 Subject: [PATCH] CScanTs: revert to pu/cc code Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2ed1f7eee2e1863f738e7efe901fe5f843601487 Author: Stefan Seyfried Date: 2013-04-06 (Sat, 06 Apr 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/scan.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp index 5862f5683..63474622a 100644 --- a/src/gui/scan.cpp +++ b/src/gui/scan.cpp @@ -198,15 +198,13 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey) ypos_radar = y + hheight + (mheight >> 1); xpos1 = x + 10; + sigscale->reset(); + snrscale->reset(); + lastsig = lastsnr = -1; + if (!frameBuffer->getActive()) return menu_return::RETURN_EXIT_ALL; - if (!sigscale) - sigscale = new CProgressBar(true, BAR_WIDTH, BAR_HEIGHT); - if (!snrscale) - snrscale = new CProgressBar(true, BAR_WIDTH, BAR_HEIGHT); - lastsig = lastsnr = -1; - CRecordManager::getInstance()->StopAutoRecord(); g_Zapit->stopPlayBack(); @@ -361,10 +359,6 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey) } hide(); - delete sigscale; - sigscale = NULL; - delete snrscale; - snrscale = NULL; CZapit::getInstance()->scanPids(scan_pids); videoDecoder->StopPicture();