From e76a0fb8d8565e894ac23aff1fbf23e533956d60 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 22 Feb 2017 16:13:19 +0100
Subject: [PATCH] Fix crash when selecting muticolumn in math

The cells that are part of the multicolumn are not in the cache, and
it is OK.

Fixes bug #10486.
---
 src/mathed/InsetMathNest.cpp | 3 +++
 status.22x                   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 6f32364964..52524c70c6 100644
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -311,6 +311,9 @@ void InsetMathNest::drawSelection(PainterInfo & pi, int x, int y) const
 		for (idx_type i = 0; i < nargs(); ++i) {
 			if (idxBetween(i, s1.idx(), s2.idx())) {
 				MathData const & c = cell(i);
+				// this can happen when cell is part of multicolumn
+				if (!bv.coordCache().getArrays().has(&c))
+					continue;
 				Geometry const & g = bv.coordCache().getArrays().geometry(&c);
 				int x1 = g.pos.x_;
 				int y1 = g.pos.y_ - g.dim.ascent();
diff --git a/status.22x b/status.22x
index f098e3883d..df669fa107 100644
--- a/status.22x
+++ b/status.22x
@@ -172,6 +172,8 @@ What's new
 
 - Fix crash when the document contains Unicode line-breaking characters.
 
+- Fix assertion when selecting muticolumn in math (bug 10486).
+
 - Allow using colors supported by xcolor inside mathed (bug 10417).
 
 - Change description of "frame of button" color to "button frame" (bug