diff --git a/Plugins/M3u/M3uContainer.m b/Plugins/M3u/M3uContainer.m index 5fde70f3b..4f77d0301 100644 --- a/Plugins/M3u/M3uContainer.m +++ b/Plugins/M3u/M3uContainer.m @@ -92,6 +92,16 @@ filecontents[size] = '\0'; } + + // Handle macOS Classic and Windows line endings + { + char * contentsscan = filecontents; + while (*contentsscan) { + if (*contentsscan == '\r') + *contentsscan = '\n'; + ++contentsscan; + } + } DLog(@"Trying UTF8"); NSStringEncoding encoding = NSUTF8StringEncoding; diff --git a/Plugins/Pls/PlsContainer.m b/Plugins/Pls/PlsContainer.m index 527d603c8..4897a8c10 100644 --- a/Plugins/Pls/PlsContainer.m +++ b/Plugins/Pls/PlsContainer.m @@ -95,6 +95,16 @@ filecontents[size] = '\0'; } + // Handle macOS Classic and Windows line endings + { + char * contentsscan = filecontents; + while (*contentsscan) { + if (*contentsscan == '\r') + *contentsscan = '\n'; + ++contentsscan; + } + } + DLog(@"Trying UTF8"); NSStringEncoding encoding = NSUTF8StringEncoding; NSString *contents = [NSString stringWithCString:filecontents encoding:encoding];