Fix #1569 - dvr: simplify filename cleanup

diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
index adcb4302f8bf030ea5b13b58f1e90f911b2b35ad..0893562d6179bbc5f503dd8ec751f00d263babc4 100644 (file)
--- a/src/dvr/dvr_rec.c
+++ b/src/dvr/dvr_rec.c
@@ -126,12 +126,11 @@ cleanupfilename(char *s, int dvr_flags)
 {
   int i, len = strlen(s);
   for(i = 0; i < len; i++) { 
-    if(s[i] == '/' || s[i] == ':' || s[i] == '\\' || s[i] == '<' ||
-       s[i] == '>' || s[i] == '|' || s[i] == '*' || s[i] == '?')
-      s[i] = '-';
-
-    if((dvr_flags & DVR_WHITESPACE_IN_TITLE) && s[i] == ' ')
+    if((dvr_flags & DVR_WHITESPACE_IN_TITLE) && (s[i] == ' ' || s[i] == '\t'))
       s[i] = '-';      
+
+    if((s[i] < 32) || (s[i] > 122) || (strchr("/:\\<>|*?'\"", s[i]) != NULL))
+      s[i] = '-';
   }
 }