neutrino.cpp: fix startup plugin and execute it a little bit later

Origin commit data
------------------
Branch: ni/coolstream
Commit: 4898c6aa71
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-04 (Sat, 04 Apr 2015)

Origin message was:
------------------
- neutrino.cpp: fix startup plugin and execute it a little bit later

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2015-04-04 11:17:37 +02:00
parent 8923826bc4
commit cdca44c0cc

View File

@@ -2164,12 +2164,6 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
dprintf(DEBUG_NORMAL, "initialized everything\n"); dprintf(DEBUG_NORMAL, "initialized everything\n");
g_PluginList->startPlugin("startup.cfg");
if (!g_PluginList->getScriptOutput().empty()) {
ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMessageBox::mbrBack,CMessageBox::mbBack,NEUTRINO_ICON_SHELL);
}
g_RCInput->clearRCMsg();
InfoClock = CInfoClock::getInstance(); InfoClock = CInfoClock::getInstance();
if(g_settings.mode_clock) if(g_settings.mode_clock)
g_settings.mode_clock = InfoClock->StartClock(); g_settings.mode_clock = InfoClock->StartClock();
@@ -2181,6 +2175,12 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
CLuaServer *luaServer = CLuaServer::getInstance(); CLuaServer *luaServer = CLuaServer::getInstance();
g_PluginList->startPlugin("startup");
if (!g_PluginList->getScriptOutput().empty()) {
ShowMsg(LOCALE_PLUGINS_RESULT, g_PluginList->getScriptOutput(), CMessageBox::mbrBack,CMessageBox::mbBack,NEUTRINO_ICON_SHELL);
}
g_RCInput->clearRCMsg();
m_idletime = time(NULL); m_idletime = time(NULL);
m_screensaver = false; m_screensaver = false;