Fix modifying next recording if it was "0 Days, 30 Hours".

It was being modified to "0 Day, 3" rather than "30 Hours".

diff --git a/ChangeLog b/ChangeLog
index 87be5fec02b81e24d75d406290742e5089cf3744..6a1af3f73c2502b338a019e2647f7b60849385f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,13 @@
        Add in more UTF-8 encodings as required for Perl v5.18, thanks to
        Jan Schneider for reporting the UTF-8 issue.
 
-       Fix removing "0 hours" from Next Recording In if the hour is a
-       multiple of 10, thanks to Stephan Seitz for reporting this.
+2014-09-11     Andrew Ruthven
+       Spotted that if the next recording is in 30 hours, then it is
+       displayed as "0 Days, 3". Correct it so it'll be displayed
+       as "30 Hours". Also fixes an issue where "0 hours" was removed
+       if the hour was a multiple of 10. Thanks to Stephan Seitz for
+       reporting the multiple of 10 issue.
+
 
 2013-10-28     Andrew Ruthven
         Guard against zero total disk space, this affected Werner Mahr.

diff --git a/bin/mythtv-status b/bin/mythtv-status
index 5b4f3ce768368623108dc5d1ca6af60d0a34199c..4ff6c9b0056545ddf665551f99ae29d50abc5d0b 100755 (executable)
--- a/bin/mythtv-status
+++ b/bin/mythtv-status
@@ -477,7 +477,7 @@ my @blocks = (
        }
 
         $str =~ s/\b1 (Day|Hour|Minute)s/1 $1/g;
-        $str =~ s/\b(, )?0 Hours(, )?//;
+        $str =~ s/\b0 (Days|Hours)(, )?//;
         $str =~ s/, 0 Minutes$//;
 
         if ($seconds <= $c->{'recording_in_warn'}) {