mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

imageinfo_ni: align fade code to other fade code

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25147a0828
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-06 (Thu, 06 Oct 2016)

Origin message was:
------------------
- imageinfo_ni: align fade code to other fade code

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-06 21:25:49 +02:00
parent e4656e148b
commit 1475434ee5
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/imageinfo_ni.cpp
View File

@@ -173,8 +173,22 @@ int CImageInfoNI::exec(CMenuTarget* parent, const std::string &)
{ {
break; break;
} }
continue;
} }
else if (msg == CRCInput::RC_setup) if (fadeout && msg == CRCInput::RC_timeout)
{
if (fader.StartFadeOut())
{
msg = 0;
continue;
}
else
{
break;
}
}
if (msg == CRCInput::RC_setup)
{ {
res = menu_return::RETURN_EXIT_ALL; res = menu_return::RETURN_EXIT_ALL;
fadeout = true; fadeout = true;
@@ -200,18 +214,6 @@ int CImageInfoNI::exec(CMenuTarget* parent, const std::string &)
CNeutrinoApp::getInstance()->handleMsg(msg, data); CNeutrinoApp::getInstance()->handleMsg(msg, data);
} }
if (fadeout && msg == CRCInput::RC_timeout)
{
if (fader.StartFadeOut())
{
msg = 0;
}
else
{
break;
}
}
Stat_Info(&cpu); Stat_Info(&cpu);
paint_CPU_Percent(CPU_Percent(&cpu)); paint_CPU_Percent(CPU_Percent(&cpu));
} }