From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Wed, 25 Jan 2017 21:28:42 +0000 (+1300)
Subject: Fix UTF-8 handling from MythTV::Program
X-Git-Tag: 0.10.8~1
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7d806568c24ab3b1dcf6d317a2dff7d4beaa52c;p=mythtv-status.git

Fix UTF-8 handling from MythTV::Program
---

diff --git a/ChangeLog b/ChangeLog
index 3aed14a..c0d9e25 100644
--- 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 b68304a..633e8f2 100644
--- 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 a395da8..f90b57a 100755
--- 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.