From 5dd58269210a8c6e105510e2bcb65bafd04ea64f Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Sun, 3 Feb 2013 20:10:21 +0000 Subject: [PATCH] Fix #1589 - only remove "unsafe" characters if configured to do so. --- src/dvr/dvr_rec.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c index 1471ecc6..c48eafff 100644 --- a/src/dvr/dvr_rec.c +++ b/src/dvr/dvr_rec.c @@ -126,10 +126,17 @@ cleanupfilename(char *s, int dvr_flags) { int i, len = strlen(s); for(i = 0; i < len; i++) { - if((dvr_flags & DVR_WHITESPACE_IN_TITLE) && (s[i] == ' ' || s[i] == '\t')) + + if(s[i] == '/') + s[i] = '-'; + + else 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)) + else if((dvr_flags & DVR_CLEAN_TITLE) && + ((s[i] < 32) || (s[i] > 122) || + (strchr("/:\\<>|*?'\"", s[i]) != NULL))) s[i] = '-'; } }