From 1d02a4c8faf17cb3d3b2fc57caf2dc368dce67f0 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Fri, 3 Oct 2014 22:42:59 +0200
Subject: [PATCH] Fix reading multiline entries from the ini file on Windows

Based on TortoiseSVN rev. 25914.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 src/Utils/SimpleIni.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Utils/SimpleIni.h b/src/Utils/SimpleIni.h
index c9ad5a7ca..c08338915 100644
--- a/src/Utils/SimpleIni.h
+++ b/src/Utils/SimpleIni.h
@@ -1072,7 +1072,10 @@ CSimpleIniTempl<SI_CHAR,SI_STRLESS,SI_CONVERTER>::FindMultiLine(
 {
     // skip the "<<<" to get the tag that will end the multiline
     const SI_CHAR * pTagName = a_pVal + 3;
-    a_pVal = a_pData; // real value starts on next line
+#ifdef _WIN32
+	a_pData += 1; // skip the \n of the \r\n
+#endif
+	a_pVal = a_pData; // real value starts on next line
 
     // find the end tag. This tag must start in column 1 and be
     // followed by a newline. No whitespace removal is done while
-- 
2.11.4.GIT