From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Tue, 20 Nov 2007 17:38:26 +0000 (+1300)
Subject: And make sure that "time till next recording" works with the new sub handling.
X-Git-Tag: 0.5~12
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60bb35c4c0ab867940917d366ea52e6361825708;p=mythtv-status.git

And make sure that "time till next recording" works with the new sub handling.
---

diff --git a/bin/mythtv-status b/bin/mythtv-status
index 072a1c6..c427f15 100755
--- a/bin/mythtv-status
+++ b/bin/mythtv-status
@@ -170,6 +170,9 @@ my @blocks = (
     },
     'filter' =>  {
       'next_time' => sub { return $_[0] eq 'now' }
+    },
+    'sub' => sub {
+      return substitute_vars($_[0], { 'next_time' => $next_time });
     }
   },
 
@@ -218,9 +221,6 @@ for my $block (@blocks) {
 
     $output = &{ $block->{'sub'} }($block)
       if defined $block->{'sub'};
-
-  } elsif ($block->{'type'} eq 'sub') {
-    $output = substitute_vars($block, { 'next_time' => $next_time });
   }
 
   if (defined $output && $output ne '' && ! defined $hide) {