From 12a575cc39442e8da3eab496fb45234e3012ed54 Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Sun, 23 Sep 2012 16:44:22 +0200
Subject: [PATCH] Fix bug #8296: Crash when clicking on completion in math

When the user clicks on the completion, the completion disappears. This
means that we have to fix the cursor before setting it.
---
 src/BufferView.cpp | 2 ++
 status.20x         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 8130db3bea..057fe0bb32 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -2443,6 +2443,8 @@ bool BufferView::mouseSetCursor(Cursor & cur, bool select)
 		cap::saveSelection(cursor());
 
 	d->cursor_.macroModeClose();
+	// If a macro has been finalized, the cursor might have been broken
+	cur.fixIfBroken();
 
 	// Has the cursor just left the inset?
 	bool const leftinset = (&d->cursor_.inset() != &cur.inset());
diff --git a/status.20x b/status.20x
index 07b42a7267..6ad00b89c3 100644
--- a/status.20x
+++ b/status.20x
@@ -105,6 +105,8 @@ What's new
 
 * USER INTERFACE
 
+- Fix crash when clicking on a completion in math mode (bug 8296).
+
 - Fix regression in which clicking in the main work area always resets
   the selected format in View -> Source (bug 8411).