From 70939a1d84730b41224a4dfefed3b6635f1de2e0 Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Sat, 15 Nov 2014 12:19:12 +0200
Subject: Fix parsing of Windows new lines on Mk6 import

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 file.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/file.c b/file.c
index 29bbea5a8..5e8ab381f 100644
--- a/file.c
+++ b/file.c
@@ -423,9 +423,14 @@ char *parse_mkvi_value(const char *haystack, const char *needle)
 			valueptr += 2;
 		}
 		if ((endptr = strstr(lineptr, "\n")) != NULL) {
+			char terminator = '\n';
+			if (*(endptr - 1) == '\r') {
+				--endptr;
+				terminator = '\r';
+			}
 			*endptr = 0;
 			ret = strdup(valueptr);
-			*endptr = '\n';
+			*endptr = terminator;
 
 		}
 	}
-- 
cgit v1.2.3-70-g09d2