mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 10:21:04 +02:00
Merge branch 'ni/cst-next' into ni/mp/cst-next
Origin commit data
------------------
Commit: ad25cf2933
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-29 (Thu, 29 Sep 2016)
This commit is contained in:
@@ -2154,9 +2154,9 @@ TIMER_START();
|
||||
CHintBox * hintBox = new CHintBox(LOCALE_MESSAGEBOX_INFO, g_Locale->getText(LOCALE_NEUTRINO_STARTING));
|
||||
|
||||
//NI show startlogo
|
||||
bool ng_startlogo = false;
|
||||
bool startlogo = false;
|
||||
if (!show_startwizard) {
|
||||
ng_startlogo = true;
|
||||
startlogo = true;
|
||||
}
|
||||
else {
|
||||
hintBox->paint();
|
||||
@@ -2204,7 +2204,7 @@ TIMER_START();
|
||||
g_videoSettings->setVideoSettings();
|
||||
|
||||
//NI show startlogo
|
||||
if (ng_startlogo) {
|
||||
if (startlogo) {
|
||||
frameBuffer->showFrame("start.jpg");
|
||||
}
|
||||
|
||||
@@ -2326,8 +2326,8 @@ TIMER_START();
|
||||
}
|
||||
|
||||
//NI - show startlogo
|
||||
if(ng_startlogo) {
|
||||
ng_startlogo = false;
|
||||
if (startlogo) {
|
||||
startlogo = false;
|
||||
sleep(3);
|
||||
frameBuffer->stopFrame();
|
||||
}
|
||||
|
Reference in New Issue
Block a user