diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp
index 2cfafbc7f..33767955f 100644
--- a/src/driver/rcinput.cpp
+++ b/src/driver/rcinput.cpp
@@ -44,6 +44,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <limits.h>
 
 #include <sys/un.h>
 #include <sys/socket.h>
@@ -409,7 +410,7 @@ int CRCInput::messageLoop( bool anyKeyCancels, int timeout )
 	if ( timeout == -1 )
 		timeout = g_settings.timing[SNeutrinoSettings::TIMING_MENU];
 
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout == 0 ? 0xFFFF : timeout);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 	while (doLoop)
 	{
@@ -439,7 +440,7 @@ int CRCInput::messageLoop( bool anyKeyCancels, int timeout )
 					if ( anyKeyCancels )
 						doLoop = false;
 					else
-						timeoutEnd = CRCInput::calcTimeoutEnd( timeout );
+						timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 				}
 			}
 		}
@@ -539,15 +540,15 @@ int CRCInput::checkTimers()
 	return _id;
 }
 
-int64_t CRCInput::calcTimeoutEnd(const int timeout_in_seconds)
+int64_t CRCInput::calcTimeoutEnd(const int _timeout_in_seconds)
 {
-	return time_monotonic_us() + ((uint64_t)timeout_in_seconds * (uint64_t) 1000000);
+	uint64_t timeout_in_seconds = (_timeout_in_seconds == 0) ? INT_MAX : _timeout_in_seconds;
+	return time_monotonic_us() + (timeout_in_seconds * 1000000);
 }
 
 int64_t CRCInput::calcTimeoutEnd_MS(const int timeout_in_milliseconds)
 {
-	uint64_t timeNow = time_monotonic_us();
-	return ( timeNow + timeout_in_milliseconds * 1000 );
+	return time_monotonic_us() + (timeout_in_milliseconds * 1000);
 }
 
 void CRCInput::getMsgAbsoluteTimeout(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint64_t *TimeoutEnd, bool bAllowRepeatLR)
diff --git a/src/driver/volume.cpp b/src/driver/volume.cpp
index 9b66449fd..d0706fc1b 100644
--- a/src/driver/volume.cpp
+++ b/src/driver/volume.cpp
@@ -146,10 +146,10 @@ void CVolume::setVolume(const neutrino_msg_t key)
 			}
 
 			setvol(g_settings.current_volume);
-			timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR]);
+			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR]);
 		}
 		else if (msg == NeutrinoMessages::EVT_VOLCHANGED) {
-			timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR]);
+			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR]);
 		}
 		else if (CNeutrinoApp::getInstance()->handleMsg(msg, data) & messages_return::unhandled) {
 			g_RCInput->postMsg(msg, data);
diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp
index b431d3680..69ee284ab 100644
--- a/src/gui/bedit/bouqueteditor_bouquets.cpp
+++ b/src/gui/bedit/bouqueteditor_bouquets.cpp
@@ -221,7 +221,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
 
 	bouquetsChanged = false;
 
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 	bool loop = true;
 	while (loop)
@@ -229,7 +229,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
 		g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
 
 		if (msg <= CRCInput::RC_MaxRC)
-			timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+			timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 		if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel))
 		{
@@ -364,7 +364,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
 					paintFoot();
 					paintItems();
 
-					timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+					timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 				}
 			}
 			else if (state == beMoving)
diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp
index e6b0548ed..ac5a260cd 100644
--- a/src/gui/bedit/bouqueteditor_channels.cpp
+++ b/src/gui/bedit/bouqueteditor_channels.cpp
@@ -317,7 +317,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
 
 	channelsChanged = false;
 
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 	bool loop = true;
 	while (loop)
@@ -325,7 +325,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
 		g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
 
 		if (msg <= CRCInput::RC_MaxRC)
-			timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+			timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 		if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel))
 		{
@@ -362,7 +362,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey*
 			if (state == beDefault)
 				addChannel();
 
-			timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+			timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 		}
 		else if (msg == CRCInput::RC_yellow)
 		{
diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp
index 39cfacc24..09766df53 100644
--- a/src/gui/bedit/bouqueteditor_chanselect.cpp
+++ b/src/gui/bedit/bouqueteditor_chanselect.cpp
@@ -318,7 +318,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti
 	paintFoot();
 	paintItems();
 
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 	channelChanged = false;
 	bool loop = true;
@@ -327,7 +327,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti
 		g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
 
 		if (msg <= CRCInput::RC_MaxRC)
-			timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+			timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 		if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) || (msg == CRCInput::RC_home))
 		{
diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp
index 383ee2555..25a4ab6d1 100644
--- a/src/gui/bookmarkmanager.cpp
+++ b/src/gui/bookmarkmanager.cpp
@@ -251,7 +251,7 @@ const CBookmark * CBookmarkManager::getBookmark(CMenuTarget* parent)
 
 	int res = -1;
 
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 	uint32_t msg;
 	uint32_t data;
 
@@ -268,7 +268,7 @@ const CBookmark * CBookmarkManager::getBookmark(CMenuTarget* parent)
 		g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd );
 
 		if ( msg <= CRCInput::RC_MaxRC )
-			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 		if ( ( msg == CRCInput::RC_timeout ) ||
 				( msg == CRCInput::RC_home) )
diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index 5e74db9d8..30a9ea941 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -464,14 +464,14 @@ int CBouquetList::show(bool bShowChannelList)
 	int pos= lmaxpos;
 
 	int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST];
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 	bool loop=true;
 	while (loop) {
 		g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd );
 
 		if ( msg <= CRCInput::RC_MaxRC )
-			timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+			timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 		if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) {
 			if(fader.FadeDone())
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 4f4833a68..23cfcd4bc 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -618,14 +618,14 @@ int CChannelList::show()
 	bool bShowBouquetList = false;
 
 	int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST];
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 	bool loop=true;
 	bool dont_hide = false;
 	while (loop) {
 		g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true);
 		if ( msg <= CRCInput::RC_MaxRC )
-			timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+			timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 		bool empty = (*chanlist).empty();
 		if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) {
@@ -647,7 +647,7 @@ int CChannelList::show()
 					selected = selected_in_new_mode;
 				}
 				if(fader.StartFadeOut()) {
-					timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
+					timeoutEnd = CRCInput::calcTimeoutEnd(1);
 					msg = 0;
 				} else
 					loop=false;
@@ -699,7 +699,7 @@ int CChannelList::show()
 					loop = false;
 				} else {
 					paint();
-					timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+					timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 				}
 			}
 		}
@@ -734,7 +734,7 @@ int CChannelList::show()
 			else {
 				if (ret != 0)
 					paint();
-				timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+				timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 			}
 		}
 		else if (!empty && msg == (neutrino_msg_t) g_settings.key_list_start) {
diff --git a/src/gui/dboxinfo.cpp b/src/gui/dboxinfo.cpp
index 6ea4d320c..b77b859d3 100644
--- a/src/gui/dboxinfo.cpp
+++ b/src/gui/dboxinfo.cpp
@@ -110,8 +110,7 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
 	bool doLoop = true;
 
 	int timeout = g_settings.timing[SNeutrinoSettings::TIMING_MENU];
-
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout == 0 ? 0xFFFF : timeout);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 	uint32_t updateTimer = g_RCInput->addTimer(5*1000*1000, false);
 
 	while (doLoop)
@@ -129,7 +128,7 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
 				( msg == CRCInput::RC_home ) ||
 				( msg == CRCInput::RC_ok ) ) {
 			if(fader.StartFadeOut()) {
-				timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
+				timeoutEnd = CRCInput::calcTimeoutEnd(1);
 				msg = 0;
 			} else
 				doLoop = false;
@@ -157,7 +156,7 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &)
 				if ((msg <= CRCInput::RC_MaxRC) &&
 						(data == 0))                     /* <- button pressed */
 				{
-					timeoutEnd = CRCInput::calcTimeoutEnd( timeout );
+					timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 				}
 			}
 		}
diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp
index b871f87b5..70a129663 100644
--- a/src/gui/epgplus.cpp
+++ b/src/gui/epgplus.cpp
@@ -935,14 +935,14 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque
 		this->paint();
 
 		int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST];
-		uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+		uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 		bool loop = true;
 		while (loop)
 		{
 			g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
 
 			if (msg <= CRCInput::RC_MaxRC)
-				timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+				timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 
 			if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer()))
@@ -954,7 +954,7 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque
 			{
 				if (fader.StartFadeOut())
 				{
-					timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
+					timeoutEnd = CRCInput::calcTimeoutEnd(1);
 					msg = 0;
 				}
 				else
diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp
index 32c088749..51309185b 100644
--- a/src/gui/epgview.cpp
+++ b/src/gui/epgview.cpp
@@ -940,13 +940,13 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 		bool epgTextSwitchClear = true;
 
 		int timeout = g_settings.timing[SNeutrinoSettings::TIMING_EPG];
-		uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+		uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 		while (loop)
 		{
 			g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd );
 			if ( msg <= CRCInput::RC_MaxRC )
-				timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+				timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 			scrollCount = medlinecount;
 
@@ -1097,7 +1097,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 								bigFonts = g_settings.bigFonts;
 								show(channel_id,epgData.eventID,&epgData.epg_times.startzeit,false);
 								showPos=0;
-								timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+								timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 							} else
 							{
 								printf("no network devices available\n");
@@ -1128,7 +1128,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 								epgData.epg_times.startzeit + epgData.epg_times.dauer,
 								epgData.title, epgData.eventID, TIMERD_APIDS_CONF, true, recDir, &evtlist);
 							m.exec(NULL, "");
-							timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+							timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 						}
 						else if (doRecord)
 						{
@@ -1149,11 +1149,11 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 												      epgData.epg_times.startzeit - (ANNOUNCETIME + 120 ),
 												      TIMERD_APIDS_CONF, true, epgData.epg_times.startzeit - (ANNOUNCETIME + 120) > time(NULL), recDir, true);
 									ShowMsg(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO);
-									timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+									timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 								}
 							} else {
 								ShowMsg(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO);
-								timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+								timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 							}
 						}
 					}
@@ -1218,7 +1218,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 					imdb->getIMDb(epgData.title);
 					showIMDb();
 					showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons
-					timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+					timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 				}
 				else if (imdb_active && imdb->gotPoster())
 				{
@@ -1273,7 +1273,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 							     epgData.eventID, epgData.epg_times.startzeit, 0);
 						ShowMsg(LOCALE_TIMER_EVENTTIMED_TITLE, LOCALE_TIMER_EVENTTIMED_MSG, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO);
 
-						timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+						timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 					}
 					else
 						printf("timerd not available\n");
@@ -1338,7 +1338,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 			case CRCInput::RC_ok:
 			case CRCInput::RC_timeout:
 				if(fader.StartFadeOut()) {
-					timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
+					timeoutEnd = CRCInput::calcTimeoutEnd(1);
 					msg = 0;
 				} else
 					loop = false;
@@ -1346,7 +1346,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
 			default:
 				if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) {
 					if(fader.StartFadeOut()) {
-						timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
+						timeoutEnd = CRCInput::calcTimeoutEnd(1);
 						msg = 0;
 					} else
 						loop = false;
diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp
index a6e7e3778..ff835e89c 100644
--- a/src/gui/eventlist.cpp
+++ b/src/gui/eventlist.cpp
@@ -379,7 +379,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
 	int oldselected = selected;
 
 	int timeout = g_settings.timing[SNeutrinoSettings::TIMING_EPG];
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 	bool loop = true;
 	while (loop)
@@ -387,7 +387,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
 		g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
 
 		if ( msg <= CRCInput::RC_MaxRC )
-			timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+			timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 		if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) {
 			if(fader.FadeDone())
@@ -397,7 +397,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
 		{
 			selected = oldselected;
 			if(fader.StartFadeOut()) {
-				timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
+				timeoutEnd = CRCInput::calcTimeoutEnd(1);
 				msg = 0;
 			} else
 				loop = false;
@@ -493,7 +493,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
 						hide();
 						recDirs.exec(NULL,"");
 						paint(evtlist[selected].channelID);
-						timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+						timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 					} 
 					else
 					{
@@ -530,7 +530,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
 						evtlist[selected].startTime + evtlist[selected].duration,
 						evtlist[selected].description, evtlist[selected].eventID, TIMERD_APIDS_CONF, true, "", &evtlist);
 					m.exec(NULL, "");
-					timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+					timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 				}
 				timerlist.clear();
 				g_Timerd->getTimerList (timerlist);
@@ -560,7 +560,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
 			g_Timerd->getTimerList (timerlist);
 			paint(evtlist[selected].channelID );
 			paintFoot(evtlist[selected].channelID );
-			timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+			timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 		}
 		else if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel)
 		{
@@ -574,7 +574,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
 			} else {
 				selected = oldselected;
 				if(fader.StartFadeOut()) {
-					timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
+					timeoutEnd = CRCInput::calcTimeoutEnd(1);
 					msg = 0;
 				} else
 					loop = false;
@@ -610,7 +610,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
 			infozone_background = false;
 			paint(channel_id);
 			paintFoot(channel_id);
-			timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+			timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 		}
 		else if (msg == CRCInput::RC_epg)
 		{
@@ -653,7 +653,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
 					infozone_background = false;
 					paint(channel_id);
 					paintFoot(channel_id);
-					timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+					timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 				}
 			}
 		}
@@ -663,7 +663,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
 			oldEventID = -1;
 			infozone_background = false;
 			in_search = findEvents(channel_id, channelname);
-			timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+			timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 		}
 		else if (CNeutrinoApp::getInstance()->listModeKey(msg)) {
 			g_RCInput->postMsg (msg, 0);
diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp
index 772ca307d..05519d4cb 100644
--- a/src/gui/filebrowser.cpp
+++ b/src/gui/filebrowser.cpp
@@ -638,7 +638,7 @@ bool CFileBrowser::exec(const char * const dirname)
 	unsigned int oldselected = selected;
 
 	int timeout = g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER];
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 	bool loop=true;
 	while (loop)
@@ -647,7 +647,7 @@ bool CFileBrowser::exec(const char * const dirname)
 		neutrino_msg_t msg_repeatok = msg & ~CRCInput::RC_Repeat;
 
 		if (msg <= CRCInput::RC_MaxRC)
-			timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+			timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 		if(!CRCInput::isNumeric(msg))
 		{
@@ -949,7 +949,7 @@ bool CFileBrowser::playlist_manager(CFileList &playlist, unsigned int playing)
 	paintFoot();
 
 	int timeout = g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER];
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 	bool loop=true;
 	while (loop)
@@ -959,7 +959,7 @@ bool CFileBrowser::playlist_manager(CFileList &playlist, unsigned int playing)
 		neutrino_msg_t msg_repeatok = msg & ~CRCInput::RC_Repeat;
 
 		if (msg <= CRCInput::RC_MaxRC)
-			timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
+			timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 		if(!CRCInput::isNumeric(msg))
 		{
diff --git a/src/gui/hdd_info.cpp b/src/gui/hdd_info.cpp
index dc0f4a217..cb819a240 100644
--- a/src/gui/hdd_info.cpp
+++ b/src/gui/hdd_info.cpp
@@ -107,8 +107,7 @@ int CHDDInfoMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 		bool doLoop = true;
 
 		int timeout = g_settings.timing[SNeutrinoSettings::TIMING_MENU];
-
-		uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout == 0 ? 0xFFFF : timeout);
+		uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 		while (doLoop)
 		{
@@ -123,7 +122,7 @@ int CHDDInfoMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 				( msg == CRCInput::RC_home ) ||
 				( msg == CRCInput::RC_ok ) ) {
 				if(fader.StartFadeOut()) {
-					timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
+					timeoutEnd = CRCInput::calcTimeoutEnd(1);
 					msg = 0;
 				} else
 					doLoop = false;
@@ -146,7 +145,7 @@ int CHDDInfoMenu::exec(CMenuTarget* parent, const std::string &actionKey)
 					if ((msg <= CRCInput::RC_MaxRC) &&
 						(data == 0))                     /* <- button pressed */
 					{
-						timeoutEnd = CRCInput::calcTimeoutEnd( timeout );
+						timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 					}
 				}
 			}
diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp
index 1d307f26e..9f6745c01 100644
--- a/src/gui/hdd_menu.cpp
+++ b/src/gui/hdd_menu.cpp
@@ -1121,7 +1121,7 @@ int CHDDMenuHandler::checkDevice(std::string dev)
 	progress->showGlobalStatus(100);
 	progress->showStatusMessageUTF(buf);
 
-	timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+	timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 	loop = true;
 	while (loop)
 	{
diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index ef8dccaba..9d9468d90 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -964,18 +964,16 @@ void CInfoViewer::setInfobarTimeout(int timeout_ext)
 	//define timeouts
 	switch (mode)
 	{
-		case NeutrinoMessages::mode_tv:
-		case NeutrinoMessages::mode_webtv:
-				timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] + timeout_ext);
-				break;
 		case NeutrinoMessages::mode_radio:
-				timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] + timeout_ext);
+				timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] + timeout_ext);
 				break;
 		case NeutrinoMessages::mode_ts:
-				timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MOVIE] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MOVIE] + timeout_ext);
+				timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MOVIE] + timeout_ext);
 				break;
+		case NeutrinoMessages::mode_tv:
+		case NeutrinoMessages::mode_webtv:
 		default:
-				timeoutEnd = CRCInput::calcTimeoutEnd(6 + timeout_ext); 
+				timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] + timeout_ext);
 				break;
 	}
 }
@@ -1118,7 +1116,7 @@ void CInfoViewer::loop(bool show_dot)
 				}
 			}
 			if(fader.StartFadeOut())
-				timeoutEnd = CRCInput::calcTimeoutEnd (1);
+				timeoutEnd = CRCInput::calcTimeoutEnd(1);
 			else
 				res = messages_return::cancel_info;
 		} else if ((g_settings.mode_left_right_key_tv == SNeutrinoSettings::VZAP) && ((msg == CRCInput::RC_right) || (msg == CRCInput::RC_left ))) {
@@ -1331,7 +1329,7 @@ void CInfoViewer::showSubchan ()
 			} else
 				g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString (x + 10, y + dy - 2, dx - 20, text, COL_MENUCONTENT_TEXT);
 
-			uint64_t timeoutEnd_tmp = CRCInput::calcTimeoutEnd (2);
+			uint64_t timeoutEnd_tmp = CRCInput::calcTimeoutEnd(2);
 			int res = messages_return::none;
 
 			neutrino_msg_t msg;
diff --git a/src/gui/lua/lua_hintbox.cpp b/src/gui/lua/lua_hintbox.cpp
index eec52f441..f7609ab4d 100644
--- a/src/gui/lua/lua_hintbox.cpp
+++ b/src/gui/lua/lua_hintbox.cpp
@@ -138,7 +138,7 @@ int CLuaInstHintbox::HintboxExec(lua_State *L)
 		timeout = 5; /// default timeout 5 sec
 	//timeout = g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR];
 
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout );
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 	int res = messages_return::none;
 
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 8c1fb33a5..a04389720 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -309,14 +309,14 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 
 		paintWindowSize(old_window_width, old_window_height);
 
-		uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+		uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 		bool loop=true;
 		while (loop) {
 			g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true);
 
 			if ( msg <= CRCInput::RC_MaxRC )
-				timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+				timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 			if ( msg == CRCInput::RC_ok ) {
 				memset(window_size_value, 0, sizeof(window_size_value));
diff --git a/src/gui/pipsetup.cpp b/src/gui/pipsetup.cpp
index d6120cec2..32365e019 100644
--- a/src/gui/pipsetup.cpp
+++ b/src/gui/pipsetup.cpp
@@ -121,14 +121,14 @@ int CPipSetup::exec(CMenuTarget* parent, const std::string &)
 
 	paint();
 
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 	bool loop=true;
 	while (loop) {
 		g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true);
 
 		if ( msg <= CRCInput::RC_MaxRC )
-			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 		if ((msg == (neutrino_msg_t) g_settings.key_pip_setup) ||
 			(msg == CRCInput::RC_timeout) || (msg == CRCInput::RC_ok)) {
diff --git a/src/gui/screensetup.cpp b/src/gui/screensetup.cpp
index 5c1e29647..2ffd55c76 100644
--- a/src/gui/screensetup.cpp
+++ b/src/gui/screensetup.cpp
@@ -96,8 +96,7 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
 
 	selected = 0;
 
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings
-::TIMING_MENU]);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 	bool loop=true;
 	while (loop)
@@ -105,8 +104,7 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &)
 		g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd, true );
 
 		if ( msg <= CRCInput::RC_MaxRC )
-			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings
-::TIMING_MENU]);
+			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 		switch ( msg )
 		{
diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp
index 34c61c0f6..5f899809d 100644
--- a/src/gui/timerlist.cpp
+++ b/src/gui/timerlist.cpp
@@ -857,7 +857,7 @@ int CTimerList::show()
 
 	int res = menu_return::RETURN_REPAINT;
 
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 	bool loop=true;
 	bool update=true;
@@ -883,7 +883,7 @@ int CTimerList::show()
 		}
 			
 		if ( msg <= CRCInput::RC_MaxRC )
-			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 		if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer()))
 		{
@@ -899,7 +899,7 @@ int CTimerList::show()
 		{	//Exit after timeout or cancel key
 			if (fader.StartFadeOut())
 			{
-				timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
+				timeoutEnd = CRCInput::calcTimeoutEnd(1);
 				msg = 0;
 			}
 			else
diff --git a/src/gui/widget/colorchooser.cpp b/src/gui/widget/colorchooser.cpp
index 9cee6d6f9..9253752cb 100644
--- a/src/gui/widget/colorchooser.cpp
+++ b/src/gui/widget/colorchooser.cpp
@@ -151,14 +151,14 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &)
 
 	int  selected = 0;
 
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 	bool loop=true;
 	while (loop) {
 		g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true);
 
 		if ( msg <= CRCInput::RC_MaxRC )
-			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 		int val = (*value[selected]);
 		switch ( msg ) {
diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp
index c08b31be5..ec9cd854e 100644
--- a/src/gui/widget/hintbox.cpp
+++ b/src/gui/widget/hintbox.cpp
@@ -208,7 +208,7 @@ int CHintBox::exec()
 	if (timeout == NO_TIMEOUT || timeout == DEFAULT_TIMEOUT)
 		timeout = HINTBOX_DEFAULT_TIMEOUT;
 
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout );
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
 
 	if (timeout > 0)
 		enableTimeOutBar();
diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp
index 9d756188b..293e73676 100644
--- a/src/gui/widget/keyboard_input.cpp
+++ b/src/gui/widget/keyboard_input.cpp
@@ -567,7 +567,7 @@ int CKeyboardInput::exec(CMenuTarget* parent, const std::string &)
 	paint();
 	paintKeyboard();
 
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 	bool loop=true;
 	while (loop)
@@ -580,7 +580,7 @@ int CKeyboardInput::exec(CMenuTarget* parent, const std::string &)
 		g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true);
 
 		if (msg <= CRCInput::RC_MaxRC)
-			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 		if (msg==CRCInput::RC_left)
 		{
@@ -635,7 +635,7 @@ int CKeyboardInput::exec(CMenuTarget* parent, const std::string &)
 		{
 			if ((inputString->getValue() != oldval) &&
 					(ShowMsg(title, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbCancel) == CMsgBox::mbrCancel)) {
-				timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+				timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 				continue;
 			}
 
diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 673ef9f30..a6feeac7a 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -799,7 +799,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 	int pos = selected;
 
 	int retval = menu_return::RETURN_REPAINT;
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 		
 	bool bAllowRepeatLR_override = keyActionMap.find(CRCInput::RC_left) != keyActionMap.end() || keyActionMap.find(CRCInput::RC_right) != keyActionMap.end();
 	do {
@@ -811,7 +811,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 
 		int handled= false;
 		if ( msg <= CRCInput::RC_MaxRC ) {
-			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 			std::map<neutrino_msg_t, keyAction>::iterator it = keyActionMap.find(msg);
 			if (it != keyActionMap.end()) {
@@ -1035,7 +1035,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 		}
 		if(msg == CRCInput::RC_timeout) {
 			if(fade && fader.StartFadeOut()) {
-				timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
+				timeoutEnd = CRCInput::calcTimeoutEnd(1);
 				msg = 0;
 				continue;
 			}
@@ -1044,7 +1044,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 		if ( msg <= CRCInput::RC_MaxRC )
 		{
 			// recalculate timeout for RC-keys
-			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 		}
 		frameBuffer->blit();
 	}
diff --git a/src/gui/widget/shellwindow.cpp b/src/gui/widget/shellwindow.cpp
index f2b641f5a..60af07803 100644
--- a/src/gui/widget/shellwindow.cpp
+++ b/src/gui/widget/shellwindow.cpp
@@ -283,7 +283,7 @@ void CShellWindow::showResult()
 
 			neutrino_msg_t msg;
 			neutrino_msg_data_t data;
-			uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+			uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 			if (!exit)
 			{
diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp
index 4c913fa96..89cae58b7 100644
--- a/src/gui/widget/stringinput.cpp
+++ b/src/gui/widget/stringinput.cpp
@@ -407,7 +407,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
 
 	paint();
 
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 	bool loop=true;
 	while (loop)
@@ -422,7 +422,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
 		g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true );
 
 		if ( msg <= CRCInput::RC_MaxRC )
-			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+			timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 		if ((msg == NeutrinoMessages::EVT_TIMER) && (data == smstimer))
 			msg = CRCInput::RC_right;
@@ -493,7 +493,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
 			string tmp_name = name == NONEXISTANT_LOCALE ? head : g_Locale->getText(name);
 			if ((trim (*valueString) != trim(oldval)) &&
 			     (ShowMsg(tmp_name, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbCancel) == CMsgBox::mbrCancel)) {
-				timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+				timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 				continue;
 			}
 
diff --git a/src/gui/widget/stringinput_ext.cpp b/src/gui/widget/stringinput_ext.cpp
index 0de0282d9..aa11a805f 100644
--- a/src/gui/widget/stringinput_ext.cpp
+++ b/src/gui/widget/stringinput_ext.cpp
@@ -187,7 +187,7 @@ int CExtendedInput::exec( CMenuTarget* parent, const std::string & )
 	paint();
 	frameBuffer->blit();
 
-	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+	uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 
 	bool loop=true;
 	while (loop)
@@ -281,7 +281,7 @@ int CExtendedInput::exec( CMenuTarget* parent, const std::string & )
 						 *cancel = false;
 				 }
 				 else if(erg==CMsgBox::mbrCancel){
-					 timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
+					 timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 				 }
 			} else {
 				loop=false;