From 2e5cfd933363b3d8fbebd226d38affc05a0f997f Mon Sep 17 00:00:00 2001
From: Eberhard Graether <egraether@gmail.com>
Date: Mon, 20 Aug 2018 14:43:44 +0200
Subject: [PATCH] ui: Fixed code annotations missing in snippet mode for files
 with /r/n line endings

---
 src/lib_gui/qt/element/QtCodeField.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/lib_gui/qt/element/QtCodeField.cpp b/src/lib_gui/qt/element/QtCodeField.cpp
index 0581a64d..55224124 100644
--- a/src/lib_gui/qt/element/QtCodeField.cpp
+++ b/src/lib_gui/qt/element/QtCodeField.cpp
@@ -48,9 +48,19 @@ QtCodeField::QtCodeField(
 	viewport()->setCursor(Qt::ArrowCursor);
 
 	std::string displayCode = m_code;
-	if (!locationFile->isWhole() && !displayCode.empty() && *displayCode.rbegin() == '\n')
+
+	// avoid extra line at end of snippet
+	if (!locationFile->isWhole())
 	{
-		displayCode.pop_back();
+		if (!displayCode.empty() && *displayCode.rbegin() == '\n')
+		{
+			displayCode.pop_back();
+		}
+
+		if (!displayCode.empty() && *displayCode.rbegin() == '\r')
+		{
+			displayCode.pop_back();
+		}
 	}
 
 	TextCodec codec(ApplicationSettings::getInstance()->getTextEncoding().c_str());