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

Merge branch 'master' of git.lyx.org:lyx

Browse Source
This commit is contained in:
Juergen Spitzmueller 2012-09-17 11:36:47 +02:00
commit f5b4cd90a3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Undo.cpp
View File

@ -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