From cdca44c0cc6e97c70e0e3310ca5a6f47478b2506 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 4 Apr 2015 11:17:37 +0200 Subject: [PATCH] neutrino.cpp: fix startup plugin and execute it a little bit later Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/4898c6aa7196ad3830a2ee44a790618ea8a99aee Author: vanhofen 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 --- src/neutrino.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index bf981d7cd..8c4bf1fbf 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -2164,12 +2164,6 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) 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(); if(g_settings.mode_clock) g_settings.mode_clock = InfoClock->StartClock(); @@ -2181,6 +2175,12 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu) 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_screensaver = false;