From 83715153fca9b5fb868191fb0054678fa6ec0b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Mon, 8 Oct 2018 11:50:36 +0200
Subject: [PATCH] [escher] LayoutField: the buffer layout needs to be cleared
 before next use of layout_field

---
 escher/src/layout_field.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/escher/src/layout_field.cpp b/escher/src/layout_field.cpp
index 3ccfd20fd..ad17094dc 100644
--- a/escher/src/layout_field.cpp
+++ b/escher/src/layout_field.cpp
@@ -185,7 +185,10 @@ bool LayoutField::privateHandleEvent(Ion::Events::Event event) {
   }
   if (isEditing() && m_delegate->layoutFieldShouldFinishEditing(this, event)) { //TODO use class method?
     setEditing(false);
-    m_delegate->layoutFieldDidFinishEditing(this, layout(), event);
+    if (m_delegate->layoutFieldDidFinishEditing(this, layout(), event)) {
+      // Reinit layout for next use
+      clearLayout();
+    }
     return true;
   }
   if ((event == Ion::Events::OK || event == Ion::Events::EXE) && !isEditing()) {