diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp
index cdd26c050..8023573cd 100644
--- a/src/driver/rcinput.cpp
+++ b/src/driver/rcinput.cpp
@@ -380,9 +380,12 @@ int CRCInput::addTimer(const time_t *Timeout)
 	return addTimer( (uint64_t)*Timeout* (uint64_t) 1000000, true, false );
 }
 
-void CRCInput::killTimer(uint32_t id)
+void CRCInput::killTimer(uint32_t &id)
 {
 //printf("killing timer %d\n", id);
+	if(id == 0)
+		return;
+
 	std::vector<timer>::iterator e;
 	for ( e= timers.begin(); e!= timers.end(); ++e )
 		if ( e->id == id )
@@ -390,6 +393,7 @@ void CRCInput::killTimer(uint32_t id)
 			timers.erase(e);
 			break;
 		}
+	id = 0;
 }
 
 int CRCInput::checkTimers()
@@ -1017,7 +1021,7 @@ printf("[neutrino] CSectionsdClient::EVT_GOT_CN_EPG\n");
 								break;
 							case CZapitClient::EVT_PMT_CHANGED:
 								*msg          = NeutrinoMessages::EVT_PMT_CHANGED;
-								*data         = 0;
+								*data = (neutrino_msg_data_t) p;
 								break;
 							default:
 								printf("[neutrino] event INITID_ZAPIT - unknown eventID 0x%x\n",  emsg.eventID );
diff --git a/src/driver/rcinput.h b/src/driver/rcinput.h
index 34fe71076..056a295b3 100644
--- a/src/driver/rcinput.h
+++ b/src/driver/rcinput.h
@@ -267,7 +267,7 @@ class CRCInput
 		int addTimer(struct timeval Timeout);
 		int addTimer(const time_t *Timeout);
 
-		void killTimer(uint32_t id);
+		void killTimer(uint32_t &id);
 
 		static int64_t calcTimeoutEnd_MS(const int timeout_in_milliseconds);
 		static int64_t calcTimeoutEnd(const int timeout_in_seconds);
diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index c822a9608..4a8302b23 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -2294,9 +2294,7 @@ void CAudioPlayerGui::screensaver(bool on)
 	}
 	else
 	{
-		if (stimer)
-			g_RCInput->killTimer(stimer);
-		stimer = 0;
+		g_RCInput->killTimer(stimer);
 		m_screensaver = false;
 #if 0
 		m_frameBuffer->loadPal("radiomode.pal", 18, COL_MAXFREE);
diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index 49ca5d77b..8231940fa 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -354,7 +354,6 @@ int CBouquetList::show(bool bShowChannelList)
 				if (fadeValue >= 100) {
 					fadeValue = g_settings.menu_Content_alpha;
 					g_RCInput->killTimer (fadeTimer);
-					fadeTimer = 0;
 					loop = false;
 				} else
 					frameBuffer->setBlendLevel(fadeValue, fadeValue);
@@ -363,7 +362,6 @@ int CBouquetList::show(bool bShowChannelList)
 				if (fadeValue <= g_settings.menu_Content_alpha) {
 					fadeValue = g_settings.menu_Content_alpha;
 					g_RCInput->killTimer (fadeTimer);
-					fadeTimer = 0;
 					fadeIn = false;
 					//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 					frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -377,7 +375,6 @@ int CBouquetList::show(bool bShowChannelList)
 			selected = oldselected;
 			if ( fadeIn ) {
 				g_RCInput->killTimer(fadeTimer);
-				fadeTimer = 0;
 				fadeIn = false;
 			}
 			if ((!fadeOut) && g_settings.widget_fade) {
@@ -536,7 +533,6 @@ int CBouquetList::show(bool bShowChannelList)
 	hide();
         if ( fadeIn || fadeOut ) {
                 g_RCInput->killTimer(fadeTimer);
-                fadeTimer = 0;
                 //frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 		frameBuffer->setBlendMode(1); // Set back to per pixel alpha
         }
diff --git a/src/gui/dboxinfo.cpp b/src/gui/dboxinfo.cpp
index 6fd0ada8a..f9fb54e90 100644
--- a/src/gui/dboxinfo.cpp
+++ b/src/gui/dboxinfo.cpp
@@ -113,7 +113,6 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
 				if (fadeValue >= 100) {
 					fadeValue = g_settings.menu_Content_alpha;
 					g_RCInput->killTimer (fadeTimer);
-					fadeTimer = 0;
 					doLoop = false;
 				} else
 					frameBuffer->setBlendLevel(fadeValue, fadeValue);
@@ -122,7 +121,6 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
 				if (fadeValue <= g_settings.menu_Content_alpha) {
 					fadeValue = g_settings.menu_Content_alpha;
 					g_RCInput->killTimer (fadeTimer);
-					fadeTimer = 0;
 					fadeIn = false;
 					//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 					frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -135,7 +133,6 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
 				( msg == CRCInput::RC_ok ) ) {
 			if ( fadeIn ) {
 				g_RCInput->killTimer(fadeTimer);
-				fadeTimer = 0;
 				fadeIn = false;
 			}
 			if ((!fadeOut) && g_settings.widget_fade) {
@@ -174,7 +171,6 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
 	hide();
 	if ( fadeIn || fadeOut ) {
 		g_RCInput->killTimer(fadeTimer);
-		fadeTimer = 0;
 		//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 		frameBuffer->setBlendMode(1); // Set back to per pixel alpha
 	}
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index 0098f33e2..fb3111d3d 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -837,7 +837,6 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
 					if (fadeValue >= 100) {
 						fadeValue = g_settings.menu_Content_alpha;
 						g_RCInput->killTimer (fadeTimer);
-						fadeTimer = 0;
 						loop = false;
 					} else
 						frameBuffer->setBlendLevel(fadeValue, fadeValue);
@@ -846,7 +845,6 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
 					if (fadeValue <= g_settings.menu_Content_alpha) {
 						fadeValue = g_settings.menu_Content_alpha;
 						g_RCInput->killTimer (fadeTimer);
-						fadeTimer = 0;
 						fadeIn = false;
 						//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 						frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -857,7 +855,6 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
 			else if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t) g_settings.key_channelList_cancel)) {
 				if ( fadeIn ) {
 					g_RCInput->killTimer(fadeTimer);
-					fadeTimer = 0;
 					fadeIn = false;
 				}
 				if ((!fadeOut) && g_settings.widget_fade) {
@@ -1186,7 +1183,6 @@ int EpgPlus::exec (CChannelList * pchannelList, int selectedChannelIndex, CBouqu
 		this->hide();
 		if ( fadeIn || fadeOut ) {
 			g_RCInput->killTimer(fadeTimer);
-			fadeTimer = 0;
 			//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 			frameBuffer->setBlendMode(1); // Set back to per pixel alpha
 		}
diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index 981e04fbe..b6fb54308 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -300,7 +300,6 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
 				if (fadeValue >= 100) {
 					fadeValue = g_settings.menu_Content_alpha;
 					g_RCInput->killTimer (fadeTimer);
-					fadeTimer = 0;
 					loop = false;
 				} else
 					frameBuffer->setBlendLevel(fadeValue, fadeValue);
@@ -309,7 +308,6 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
 				if (fadeValue <= g_settings.menu_Content_alpha) {
 					fadeValue = g_settings.menu_Content_alpha;
 					g_RCInput->killTimer (fadeTimer);
-					fadeTimer = 0;
 					fadeIn = false;
 					//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 					frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -322,7 +320,6 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
 			selected = oldselected;
 			if ( fadeIn ) {
 				g_RCInput->killTimer(fadeTimer);
-				fadeTimer = 0;
 				fadeIn = false;
 			}
 			if ((!fadeOut) && g_settings.widget_fade) {
@@ -543,7 +540,6 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
 				selected = oldselected;
 				if ( fadeIn ) {
 					g_RCInput->killTimer(fadeTimer);
-					fadeTimer = 0;
 					fadeIn = false;
 				}
 				if ((!fadeOut) && g_settings.widget_fade) {
@@ -669,7 +665,6 @@ int EventList::exec(const t_channel_id channel_id, const std::string& channelnam
 	hide();
 	if ( fadeIn || fadeOut ) {
 		g_RCInput->killTimer(fadeTimer);
-		fadeTimer = 0;
 		//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 		frameBuffer->setBlendMode(1); // Set back to per pixel alpha
 	}
diff --git a/src/gui/pluginlist.cpp b/src/gui/pluginlist.cpp
index 5c2eb22d8..9544c5b93 100644
--- a/src/gui/pluginlist.cpp
+++ b/src/gui/pluginlist.cpp
@@ -165,7 +165,6 @@ int CPluginList::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
 				if (fadeValue >= 100) {
 					fadeValue = g_settings.menu_Content_alpha;
 					g_RCInput->killTimer (fadeTimer);
-					fadeTimer = 0;
 					loop = false;
 				} else
 					frameBuffer->setBlendLevel(fadeValue, fadeValue);
@@ -174,7 +173,6 @@ int CPluginList::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
 				if (fadeValue <= g_settings.menu_Content_alpha) {
 					fadeValue = g_settings.menu_Content_alpha;
 					g_RCInput->killTimer (fadeTimer);
-					fadeTimer = 0;
 					fadeIn = false;
 					//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 					frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -187,7 +185,6 @@ int CPluginList::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
 		{
 			if ( fadeIn ) {
 				g_RCInput->killTimer(fadeTimer);
-				fadeTimer = 0;
 				fadeIn = false;
 			}
 			if ((!fadeOut) && g_settings.widget_fade) {
@@ -285,7 +282,6 @@ int CPluginList::exec(CMenuTarget* parent, const std::string & /*actionKey*/)
 	hide();
 	if ( fadeIn || fadeOut ) {
 		g_RCInput->killTimer(fadeTimer);
-		fadeTimer = 0;
 		//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 		frameBuffer->setBlendMode(1); // Set back to per pixel alpha
 	}
diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index e8243a4ea..6835d590b 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -504,7 +504,6 @@ int CTimerList::show()
 				if (fadeValue >= 100) {
 					fadeValue = g_settings.menu_Content_alpha;
 					g_RCInput->killTimer (fadeTimer);
-					fadeTimer = 0;
 					loop = false;
 				} else
 					frameBuffer->setBlendLevel(fadeValue, fadeValue);
@@ -513,7 +512,6 @@ int CTimerList::show()
 				if (fadeValue <= g_settings.menu_Content_alpha) {
 					fadeValue = g_settings.menu_Content_alpha;
 					g_RCInput->killTimer (fadeTimer);
-					fadeTimer = 0;
 					fadeIn = false;
 					//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 					frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -526,7 +524,6 @@ int CTimerList::show()
 		{	//Exit after timeout or cancel key
 			if ( fadeIn ) {
 				g_RCInput->killTimer(fadeTimer);
-				fadeTimer = 0;
 				fadeIn = false;
 			}
 			if ((!fadeOut) && g_settings.widget_fade) {
@@ -663,7 +660,6 @@ int CTimerList::show()
 	}
 	if ( fadeIn || fadeOut ) {
 		g_RCInput->killTimer(fadeTimer);
-		fadeTimer = 0;
 		//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 		frameBuffer->setBlendMode(1); // Set back to per pixel alpha
 	}
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index f0e5e998a..f42b5e3e6 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -501,7 +501,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 							if (fadeValue >= 100) {
 								fadeValue = g_settings.menu_Content_alpha;
 								g_RCInput->killTimer (fadeTimer);
-								fadeTimer = 0;
 								msg = CRCInput::RC_timeout;
 							} else
 								frameBuffer->setBlendLevel(fadeValue, fadeValue);
@@ -510,7 +509,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 							if (fadeValue <= g_settings.menu_Content_alpha) {
 								fadeValue = g_settings.menu_Content_alpha;
 								g_RCInput->killTimer (fadeTimer);
-								fadeTimer = 0;
 								fadeIn = false;
 								//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 								frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -638,7 +636,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 							item->msg = msg;
 							if ( fadeIn ) {
 								g_RCInput->killTimer(fadeTimer);
-								fadeTimer = 0;
 								fadeIn = false;
 								//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 								frameBuffer->setBlendMode(1); // Set back to per pixel alpha
@@ -687,7 +684,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 			if(msg == CRCInput::RC_timeout) {
 				if ( fadeIn ) {
 					g_RCInput->killTimer(fadeTimer);
-					fadeTimer = 0;
 					fadeIn = false;
 				}
 				if ((!fadeOut) && g_settings.widget_fade && fade) {
@@ -712,7 +708,6 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 
 	if ( fadeIn || fadeOut ) {
 		g_RCInput->killTimer(fadeTimer);
-		fadeTimer = 0;
 		//frameBuffer->setBlendLevel(FADE_RESET, g_settings.gtx_alpha2);
 		frameBuffer->setBlendMode(1); // Set back to per pixel alpha
 	}