From d105113462c039d24f60ed8e3213ae45712c0d13 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Sat, 8 Jun 2013 17:14:21 +0200 Subject: [PATCH] neutrino.cpp/stop_daemons(): display "Stop daemons" only in flash mode Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/64974f06921d655135070fcb75d8d71737cb53ac Author: Michael Liebmann Date: 2013-06-08 (Sat, 08 Jun 2013) Origin message was: ------------------ * neutrino.cpp/stop_daemons(): display "Stop daemons" only in flash mode ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 3d5fab1ce..85ab3adae 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3564,9 +3564,11 @@ void CNeutrinoApp::stopDaemonsForFlash() **************************************************************************************/ void stop_daemons(bool stopall, bool for_flash) { - CVFD::getInstance()->Clear(); - CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); - CVFD::getInstance()->ShowText("Stop daemons..."); + if (for_flash) { + CVFD::getInstance()->Clear(); + CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); + CVFD::getInstance()->ShowText("Stop daemons..."); + } dvbsub_close(); tuxtxt_stop(); @@ -3630,7 +3632,6 @@ void stop_daemons(bool stopall, bool for_flash) delete videoDemux; my_system(NEUTRINO_ENTER_FLASH_SCRIPT); } - CVFD::getInstance()->ShowText("Stop daemons done"); } void stop_video()