From ee2ebdcdc0a1f46ccbc46d284d92defae531ae1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Wed, 1 Aug 2018 10:45:28 +0200 Subject: [PATCH] [poincare] addLayoutAndMoveCursor collapses only if layout is not AFail --- poincare/src/layout_cursor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/poincare/src/layout_cursor.cpp b/poincare/src/layout_cursor.cpp index 4b628e21f..c875c0464 100644 --- a/poincare/src/layout_cursor.cpp +++ b/poincare/src/layout_cursor.cpp @@ -213,9 +213,10 @@ void LayoutCursor::insertText(const char * text) { } void LayoutCursor::addLayoutAndMoveCursor(LayoutRef l) { + LayoutRef rootRef = m_layoutRef.root(); bool layoutWillBeMerged = l.isHorizontal(); m_layoutRef.addSibling(this, l, true); - if (!layoutWillBeMerged) { + if (!rootRef.isAllocationFailure() && !layoutWillBeMerged) { l.collapseSiblings(this); } }