Merge remote-tracking branch 'tuxbox/master'

Origin commit data
------------------
Branch: ni/coolstream
Commit: 48ff7b36a2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)


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

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

src/neutrino.cpp

@@ -99,6 +99,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"
@@ -145,6 +146,7 @@
 int old_b_id = -1;
 
 CInfoClock      *InfoClock;
+CTimeOSD	*FileTimeOSD;
 int allow_flash = 1;
 Zapit_config zapitCfg;
 char zapit_lat[20]="#";
@@ -2212,6 +2214,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;
 
@@ -2403,9 +2407,6 @@ void CNeutrinoApp::RealRun()
 
 	dprintf(DEBUG_NORMAL, "initialized everything\n");
 
-	//activating infoclock
-	InfoClock = CInfoClock::getInstance();
-
 	if(g_settings.power_standby || init_cec_setting)
 		standbyMode(true, true);
 
@@ -3689,6 +3690,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
 
 				my_system("/etc/init.d/rcK");
 				sync();
+				CFSMounter::umount(); // unreachable NFS server
 				my_system(2,"/bin/umount", "-a");
 				sleep(1);
 
@@ -4372,6 +4374,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();