Fix UTF-8 handling from MythTV::Program

diff --git a/ChangeLog b/ChangeLog
index 3aed14aef316cc7ac9c7f84c7b6d9ad59906f649..c0d9e25aca6a9a3b47249075b92f213108b55d83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2017-01-26     Andrew Ruthven
        Update the Copyright years.
+       Decode UTF-8 characters when we're getting data using MythTV::Program,
+       thank you Illés Solfor submitting a patch to fix Schedule Conflicts.
 
 2016-09-09     Andrew Ruthven
        Fix a bug where it wasn't possible to disable skipping idle

diff --git a/THANKS b/THANKS
index b68304acd6b1b14121caf062a8640f940e11a738..633e8f2e474528a9cd94675ef1a69bcc436ddc86 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -20,6 +20,7 @@ I'd like to thank the following people:
  - Julian Gilbey - Fixing up some errors in reporting the next scheduled
    recording.
  - Göran Uddeborg- Reporting the DateCalc behaviour change.
+ - Illés Sol    - UTF-8 character handling from MythTV::Program.
  - The Debian translators - Especially the Portuguese guys - you rock!
  - All the MythTV developers for working on a great bit of software
  

diff --git a/bin/mythtv-status b/bin/mythtv-status
index a395da88fc7341319a2b510e4530262594590ef7..f90b57a2461f7f76d7cd2252da099e3499bbb62f 100755 (executable)
--- a/bin/mythtv-status
+++ b/bin/mythtv-status
@@ -895,7 +895,7 @@ sub process_conflicts {
         );
 
       my $str = substitute_vars($block, \%vars);
-      push @lines, $str
+      push @lines, decode('UTF-8', $str)
         if defined $str;
     }
   }
@@ -947,7 +947,7 @@ sub process_auto_expire {
       );
 
     my $str = substitute_vars($block, \%vars);
-    push @lines, $str
+    push @lines, decode('UTF-8', $str)
       if defined $str;
 
     # Don't do more work than is required.