dvr: remove legal character ' from unsafe/windows compatible filenames list

Conflicts:
	src/dvr/dvr_rec.c

diff --git a/docs/html/config_dvr.html b/docs/html/config_dvr.html
index a0efaa2f2c7b42750c064633cacb8302cb12a3fd..e3e865ef0398480a02165a12eb90532c142e7063 100644 (file)
--- a/docs/html/config_dvr.html
+++ b/docs/html/config_dvr.html
@@ -178,7 +178,7 @@
   <dt>Remove all unsafe characters from filename
   <dd>If checked, all characters that could possibly cause problems for filenaming will be replaced with '_'.<br>
          Applies to characters:<br>
-      * not supported by Windows characters: <i>/ : \ < > | * ? ' "</i><br>
+      * not supported by Windows characters: <i>/ : \ < > | * ? "</i><br>
       * control characters (ASCII code below 32)<br>
       * control and national characters (ASCII code above 122)<br> 
   
@@ -187,7 +187,7 @@
   
   <dt>Use Windows-compatible filenames
   <dd>If checked:<br>
-      * special characters not supported by Windows like: <i>/ : \ < > | * ? ' "</i> will be replaced with '_'<br>
+      * special characters not supported by Windows like: <i>/ : \ < > | * ? "</i> will be replaced with '_'<br>
       * trailing spaces ' ' and dots '.' will be removed
   
  </dl>

diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
index 750a3194fb2d26f421a72bbaa1bd909c6e47ab97..99f294eab2a12ddf00266112699c686084ff76fa 100644 (file)
--- a/src/dvr/dvr_rec.c
+++ b/src/dvr/dvr_rec.c
@@ -168,7 +168,7 @@ cleanup_filename(char *s, dvr_config_t *cfg)
              (strchr("/:\\<>|*?'\"", s[i]) != NULL)))
       s[i] = '_';
     else if(cfg->dvr_windows_compatible_filenames &&
-             (strchr("/:\\<>|*?'\"", s[i]) != NULL))
+             (strchr("/:\\<>|*?\"", s[i]) != NULL))
       s[i] = '_';
   }