From: Andrew Ruthven Date: Thu, 11 Sep 2014 11:59:26 +0000 (+1200) Subject: Fix modifying next recording if it was "0 Days, 30 Hours". X-Git-Tag: 0.10.6~4 X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=000290f32d26d6e4f1f5e93226f137fb3ff546d6;p=mythtv-status.git 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 87be5fe..6a1af3f 100644 --- 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 5b4f3ce..4ff6c9b 100755 --- 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'}) {