Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: 43ef78ee44
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)



------------------
This commit was generated by Migit

src/neutrino.cpp

@@ -100,6 +100,7 @@
 #include "gui/widget/menue.h"
 #include "gui/widget/msgbox.h"
 #include "gui/infoclock.h"
+#include "gui/timeosd.h"
 #include "gui/parentallock_setup.h"
 #ifdef ENABLE_PIP
 #include "gui/pipsetup.h"
@@ -146,6 +147,7 @@
 int old_b_id = -1;
 
 CInfoClock      *InfoClock;
+CTimeOSD	*FileTimeOSD;
 
 //NI InfoIcons
 #include "gui/infoicons.h"
@@ -2338,6 +2340,12 @@ TIMER_START();
 
 	g_RemoteControl = new CRemoteControl;
 	g_EpgData = new CEpgData;
+	InfoClock = CInfoClock::getInstance();
+	//NI InfoIcons
+	InfoIcons = CInfoIcons::getInstance();
+	if(g_settings.mode_icons)
+		InfoIcons->StartIcons();
+	FileTimeOSD = CTimeOSD::getInstance();
 	g_InfoViewer = new CInfoViewer;
 	g_EventList = new CEventList;
 
@@ -2551,14 +2559,6 @@ void CNeutrinoApp::RealRun()
 
 	dprintf(DEBUG_NORMAL, "initialized everything\n");
 
-	//activating infoclock
-	InfoClock = CInfoClock::getInstance();
-
-	//NI InfoIcons
-	InfoIcons = CInfoIcons::getInstance();
-	if(g_settings.mode_icons)
-		InfoIcons->StartIcons();
-
 	if(g_settings.power_standby || init_cec_setting)
 		standbyMode(true, true);
 
@@ -4647,6 +4647,8 @@ void stop_daemons(bool stopall, bool for_flash)
 	  	videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)0);
 	}
 
+	delete InfoClock;
+	delete FileTimeOSD;
 	delete &CMoviePlayerGui::getInstance();
 
 	CZapit::getInstance()->Stop();