From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 23 Nov 2018 15:53:53 +0000 (+0100)
Subject: Fix undo after breaking a nested paragraph
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0830c6238514a22cf31e9bd1e10d327af7f1aac4;p=features.git

Fix undo after breaking a nested paragraph

We have to take into account that Buffer::updateBuffer can modify the document.

Fix bug #11292.
---

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index c47610937b..b9ba830c7b 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -1412,11 +1412,13 @@ DispatchResult const & GuiApplication::dispatch(FuncRequest const & cmd)
 		// This handles undo groups automagically
 		UndoGroupHelper ugh(buffer);
 		dispatch(cmd, dr);
+		// redraw the screen at the end (first of the two drawing steps).
+		// This is done unless explicitly requested otherwise.
+		// This code is kept inside the undo group because updateBuffer
+		// can create undo actions (see #11292)
+		updateCurrentView(cmd, dr);
 	}
 
-	// redraw the screen at the end (first of the two drawing steps).
-	// This is done unless explicitly requested otherwise
-	updateCurrentView(cmd, dr);
 	d->dispatch_result_ = dr;
 	return d->dispatch_result_;
 }