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

Origin commit data
------------------
Commit: 09be0b85b4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)

src/gui/osd_setup.cpp

@@ -757,6 +757,9 @@ int COsdSetup::showOsdSetup()
 			CAudioMute::getInstance()->enableMuteIcon(true);
 	}
 
+#if !defined BOXMODEL_CS_HD2
+	delete scartFileNotifier;
+#endif
 	delete colorInfoclockNotifier;
 	delete screensaverNotifier;
 	delete channellistNotifier;