From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Wed, 23 May 2012 06:02:40 +0000 (+0200)
Subject: Fix bug #8166: Crash on clicking away from empty last paragraph
X-Git-Tag: 2.0.4~59
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=dacab5cf7be53e474452ebb9880ae4338b22fdfb;p=features.git

Fix bug #8166: Crash on clicking away from empty last paragraph

We always have to call 'notifyCursorLeaves', but we only have to make sure
that we call the 'fixIfBroken()' functions first.
(cherry picked from commit d20cb73b874a30b82fe01d3b8f385ef066fafedf)
---

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index b0d3135b41..dda765ef8f 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -2171,8 +2171,8 @@ void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
 
 	// Notify left insets
 	if (cur != old) {
-		bool badcursor = old.fixIfBroken() | cur.fixIfBroken()
-				| notifyCursorLeavesOrEnters(old, cur);
+		bool badcursor = old.fixIfBroken() | cur.fixIfBroken();
+		badcursor |= notifyCursorLeavesOrEnters(old, cur);
 		if (badcursor)
 			cursor().fixIfBroken();
 	}