about summary refs log tree commit diff
path: root/src/engine/shared/linereader.cpp
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2010-10-01 12:43:44 +0200
committeroy <Tom_Adams@web.de>2010-10-01 12:43:44 +0200
commita62a7413d1ff25c8e07657b96a485f001004619a (patch)
treed78f20bb27040a11f23ef4b5a783a239f40f2a6b /src/engine/shared/linereader.cpp
parent67e9f03f23a454f273aeb6f83e338c057c3efb93 (diff)
downloadzcatch-a62a7413d1ff25c8e07657b96a485f001004619a.tar.gz
zcatch-a62a7413d1ff25c8e07657b96a485f001004619a.zip
made linereader work with window line endings. Closes #196
Diffstat (limited to 'src/engine/shared/linereader.cpp')
-rw-r--r--src/engine/shared/linereader.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/engine/shared/linereader.cpp b/src/engine/shared/linereader.cpp
index b3de233b..78b574be 100644
--- a/src/engine/shared/linereader.cpp
+++ b/src/engine/shared/linereader.cpp
@@ -51,6 +51,8 @@ char *CLineReader::Get()
 			if(m_aBuffer[m_BufferPos] == '\n' || m_aBuffer[m_BufferPos] == '\r')
 			{
 				// line found
+				if(m_aBuffer[m_BufferPos] == '\r' && m_BufferPos+1 < m_BufferSize && m_aBuffer[m_BufferPos+1] == '\n')
+					m_aBuffer[m_BufferPos++] = 0;
 				m_aBuffer[m_BufferPos] = 0;
 				m_BufferPos++;
 				return &m_aBuffer[LineStart];