From c21fc68e0ceb5d65240e7835b035bd6148d9e4ff Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Wed, 29 Oct 2008 00:55:34 +0100
Subject: Fixed missing switch to this channel buttons. This was a off by one
 error, when the current schedule just started. Switching to channels is now
 allowed regardless of the progress status of the current schedule. The
 progressbar should now appear even if the amount of progress is 0. This was a
 bug reported by BerndV at vdr-portal.

---
 pages/pageelems.ecpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index 45d2b7e..785f37f 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -265,18 +265,14 @@ int update_status(1);
 	if (detail) { // output for vertical toolbox
 </%cpp>
 	<& pageelems.event_timer epgid=(epgid) &>
-<%cpp>
-		if (elapsed > 0) {
-</%cpp>
 	<& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(channelId) image="zap.png" alt="" &>
 <%cpp>
-		}
 		if (LiveFeatures<features::epgsearch>().Recent()) {
 </%cpp>
 	<a href="searchresults.html?searchplain=<$ StringEscapeAndBreak(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a>
 <%cpp>
 		}
-		if (elapsed > 0) {
+		if (elapsed >= 0) {
 </%cpp>
 	<& pageelems.vlc_stream_channel channelId=(channelId) &>
 <%cpp>
@@ -288,7 +284,7 @@ int update_status(1);
 	else { // table output
 </%cpp>
 		<td class="action leftcol <? lastCurrentChanel ? "bottomrow"?>"><& pageelems.event_timer epgid=(epgid) &></td>
-		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><%cpp>if (elapsed > 0) { </%cpp><& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(channelId) image="zap.png" alt="" &><%cpp> } </%cpp></td>
+		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><& pageelems.ajax_action_href action="switch_channel" tip=(tr("Switch to this channel.")) param=(channelId) image="zap.png" alt="" &></td>
 		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><%cpp>if (LiveFeatures<features::epgsearch>().Recent()) { </%cpp><a href="searchresults.html?searchplain=<$ StringUrlEncode(title) $>"><img src="<$ LiveSetup().GetThemedLink("img", "search.png") $>" alt="" <& tooltip.hint text=(tr("Search for repeats.")) &>></img></a><%cpp> } else { </%cpp><img src="transparent.png" width="16" height="16"><%cpp> } </%cpp></td>
 		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><%cpp>if (LiveSetup().GetUseStreamdev() && elapsed > 0 && LiveFeatures<features::streamdev_server>().Loaded()) { </%cpp><a href="vlc.html?channel=<$ channelId $>"><img src="<$ LiveSetup().GetThemedLink("img", "stream_button.png") $>" alt="" <& tooltip.hint text=(tr("Stream this channel into browser.")) &>></img></a><%cpp> } else { </%cpp><img src="transparent.png" width="16" height="16"><%cpp> } </%cpp></td>
 		<td class="action <? lastCurrentChanel ? "bottomrow"?>"><& pageelems.imdb_info_href title=(title) &></td>
-- 
cgit v1.2.3