Fixed a clash in the line layout cache when caching page and caret

was reusing a slot already used.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/Editor.cxx b/src/Editor.cxx
index 3f30ba3bf..64aa75987 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -240,10 +240,14 @@ LineLayout *LineLayoutCache::Retrieve(int lineNumber, int lineCaret, int maxChar
 	allInvalidated = false;
 	int pos = -1;
 	LineLayout *ret = 0;
-	if (((level == llcCaret) || (level == llcPage)) && (lineNumber == lineCaret)) {
+	if (level == llcCaret) {
 		pos = 0;
 	} else if (level == llcPage) {
-		pos = lineNumber % length;
+		if (lineNumber == lineCaret) {
+			pos = length;
+		} else {
+			pos = lineNumber % length;
+		}
 	} else if (level == llcDocument) {
 		pos = lineNumber;
 	}