Font.cpp: fix bug #8424

[lyx.git] / src / Undo.cpp

diff --git a/src/Undo.cpp b/src/Undo.cpp
index 8abc0f2e26cdcbc38bf31ad47bf54e02b3e53774..ee87fdb0ced4ec9fd9977598d53949161e93e419 100644 (file)
--- a/src/Undo.cpp
+++ b/src/Undo.cpp
@@ -249,8 +249,10 @@ void Undo::clear()
        d->undostack_.clear();
        d->redostack_.clear();
        d->undo_finished_ = true;
-       d->group_id = 0;
-       d->group_level = 0;
+       // We used to do that, but I believe it is better to keep
+       // groups (only used in Buffer::reload for now (JMarc)
+       //d->group_id = 0;
+       //d->group_level = 0;
 }
 
 
@@ -511,8 +513,10 @@ void Undo::beginUndoGroup()
 
 void Undo::endUndoGroup()
 {
-       if (d->group_level == 0)
+       if (d->group_level == 0) {
                LYXERR0("There is no undo group to end here");
+               return;
+       }
        --d->group_level;
        if (d->group_level == 0) {
                // real end of the group