anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid crash with after a params undo.

Browse Source 
When doing a non-atomic undo, one should not try to merge with a previous params undo.

This fixes bug #7740.
This commit is contained in:
Jean-Marc Lasgouttes 2015-03-11 16:55:51 +01:00
parent 0a03528376
commit 58b3971eeb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Undo.cpp
View File

@ -121,7 +121,7 @@ struct UndoElement
ParagraphList * pars;
/// the contents of the saved MathData (for mathed)
MathData * array;
/// Only used in case of full backups
/// Only used in case of params undo
BufferParams const * bparams;
/// Was the buffer clean at this point?
bool lyx_clean;
@ -321,6 +321,7 @@ void Undo::Private::doRecordUndo(UndoKind kind,
if (!undo_finished_
&& kind != ATOMIC_UNDO
&& !stack.empty()
&& !stack.top().bparams
&& samePar(stack.top().cell, cell)
&& stack.top().kind == kind
&& stack.top().from == from