From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Tue, 22 May 2012 23:31:43 +0000 (+0200)
Subject: Fix bug #8166: Crash on clicking away from empty paragraph
X-Git-Tag: 2.1.0beta1~1843
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0a33374c;p=lyx.git

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

We rely on the 'or' operator to prevent us from calling
'notifyCursorLeaves' if one of the two cursors is broken. This doesn't
work when using the '|' operator. The compiler 'optimizes' the code in
such a way that we always call notifyCursorLeaves anyway. Using the '||'
operator fixes this.
---

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index a30c0f0c2f..1017cea7c0 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -2201,8 +2201,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()
+				|| notifyCursorLeavesOrEnters(old, cur);
 		if (badcursor)
 			cursor().fixIfBroken();
 	}