Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Conflicts:
	src/gui/components/cc_detailsline.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 609d466302
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)



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

src/neutrino.cpp

@@ -101,6 +101,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"
@@ -147,6 +148,7 @@
 int old_b_id = -1;
 
 CInfoClock      *InfoClock;
+CTimeOSD	*FileTimeOSD;
 
 //NI InfoIcons
 #include "gui/infoicons.h"
@@ -2283,6 +2285,8 @@ TIMER_START();
 
 	g_RemoteControl = new CRemoteControl;
 	g_EpgData = new CEpgData;
+	InfoClock = CInfoClock::getInstance();
+	FileTimeOSD = CTimeOSD::getInstance();
 	g_InfoViewer = new CInfoViewer;
 	g_EventList = new CEventList;
 
@@ -2491,9 +2495,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)
@@ -4500,6 +4501,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();