From 812588fb156b3da20c43930b9ce8d2c6eca58eef Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 3 Oct 2018 18:01:22 +0200 Subject: [PATCH] neutrino: align our startlogo handling to changed CFrameBuffer::showFrame() function Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/dc32ecf6f7660b830e723b60113efd036a724bf6 Author: vanhofen Date: 2018-10-03 (Wed, 03 Oct 2018) Origin message was: ------------------ - neutrino: align our startlogo handling to changed CFrameBuffer::showFrame() function ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 1a9dedd7d..d8204022c 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2562,14 +2562,12 @@ TIMER_START(); start_text[99] = '\0'; CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, start_text); - //NI show startlogo + // show startlogo bool startlogo = false; - if (!show_startwizard) { + if (!show_startwizard) startlogo = true; - } - else { + else hintBox->paint(); - } CVFD::getInstance()->init(neutrinoFonts->fontDescr.filename.c_str(), neutrinoFonts->fontDescr.name.c_str()); CVFD::getInstance()->Clear(); @@ -2624,10 +2622,9 @@ TIMER_START(); g_videoSettings = new CVideoSettings; g_videoSettings->setVideoSettings(); - //NI show startlogo - if (startlogo) { - frameBuffer->showFrame("start.jpg"); - } + // show startlogo + if (startlogo) + startlogo = frameBuffer->showFrame("start.jpg"); g_RCInput = new CRCInput(); @@ -2759,8 +2756,9 @@ TIMER_START(); startwizard.exec(NULL, ""); } - //NI - show startlogo - if (startlogo) { + // clean up startlogo + if (startlogo) + { startlogo = false; sleep(3); frameBuffer->stopFrame();