From 9b6eea6ca516ded90a896324c01bdc0a2a20f5ba Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sun, 23 Mar 2014 09:52:32 +0100
Subject: [PATCH] Do not crash when entering math in ct mode with merge dialog
 open.

Fixes: #7685.
---
 src/BufferView.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 2d3df5f866..392f380f1d 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -686,6 +686,10 @@ Change const BufferView::getCurrentChange() const
 		return Change(Change::UNCHANGED);
 
 	DocIterator dit = d->cursor_.selectionBegin();
+	// The selected content might have been changed (see #7685)
+	while (dit.inMathed())
+		// Find enclosing text cursor
+		dit.pop_back();
 	return dit.paragraph().lookupChange(dit.pos());
 }
 
-- 
2.39.2