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

Handle properly undo groups in embedded work areas

Browse Source 
When a buffer is in an embedded work area (adv. find&replace), it is
not found by BufferList:::exists(), and therefore the undo group
created in GuiApplication::dispatch and in the handling of
LFUN_COMMAND_SEQUENCE will not be closed.. Crashes can ensue, as
described in Ubuntu bug:
https://bugs.launchpad.net/bugs/1737429

The solution is to introduce BufferList::isInternal and act on it.

Fixes bug #10847.
This commit is contained in:
Jean-Marc Lasgouttes 2017-12-13 10:38:47 +01:00
parent 4d0c1c030c
commit 8b107f0490
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BufferList.cpp
View File

@ -268,7 +268,7 @@ bool BufferList::exists(FileName const & fname) const
} }
bool BufferList::isLoaded(Buffer const * b) const bool BufferList::isLoaded(Buffer const * b) const
{ {
if (!b) if (!b)
return false; return false;
@ -278,6 +278,16 @@ bool BufferList::exists(FileName const & fname) const
} }
bool BufferList::isInternal(Buffer const * b) const
{
if (!b)
return false;
BufferStorage::const_iterator cit =
find(binternal.begin(), binternal.end(), b);
return cit != binternal.end();
}
bool BufferList::isOthersChild(Buffer * parent, Buffer * child) bool BufferList::isOthersChild(Buffer * parent, Buffer * child)
{ {
LASSERT(parent, return false); LASSERT(parent, return false);

3
src/BufferList.h
View File

@ -84,6 +84,9 @@ public:
/// returns true if the buffer is loaded /// returns true if the buffer is loaded
bool isLoaded(Buffer const * b) const; bool isLoaded(Buffer const * b) const;
/// returns true if the buffer is known as internal buffer
bool isInternal(Buffer const * b) const;
/// \return index of named buffer in buffer list /// \return index of named buffer in buffer list
int bufferNum(support::FileName const & name) const; int bufferNum(support::FileName const & name) const;

6
src/Undo.cpp
View File

@ -569,7 +569,8 @@ void Undo::beginUndoGroup()
if (d->group_level_ == 0) { if (d->group_level_ == 0) {
// create a new group // create a new group
++d->group_id_; ++d->group_id_;
LYXERR(Debug::UNDO, "+++++++Creating new group " << d->group_id_); LYXERR(Debug::UNDO, "+++++++ Creating new group " << d->group_id_
<< " for buffer " << &d->buffer_);
} }
++d->group_level_; ++d->group_level_;
} }
@ -593,7 +594,8 @@ void Undo::endUndoGroup()
if (d->group_level_ == 0) { if (d->group_level_ == 0) {
// real end of the group // real end of the group
d->group_cur_before_ = CursorData(); d->group_cur_before_ = CursorData();
LYXERR(Debug::UNDO, "-------End of group " << d->group_id_); LYXERR(Debug::UNDO, "------- End of group " << d->group_id_
<< " of buffer " << &d->buffer_);
} }
} }

4
src/frontends/qt4/GuiApplication.cpp
View File

@ -1402,7 +1402,7 @@ DispatchResult const & GuiApplication::dispatch(FuncRequest const & cmd)
updateCurrentView(cmd, dr); updateCurrentView(cmd, dr);
// the buffer may have been closed by one action // the buffer may have been closed by one action
if (theBufferList().isLoaded(buffer)) if (theBufferList().isLoaded(buffer) || theBufferList().isInternal(buffer))
buffer->undo().endUndoGroup(); buffer->undo().endUndoGroup();
d->dispatch_result_ = dr; d->dispatch_result_ = dr;
@ -1871,7 +1871,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
dispatch(func); dispatch(func);
} }
// the buffer may have been closed by one action // the buffer may have been closed by one action
if (theBufferList().isLoaded(buffer)) if (theBufferList().isLoaded(buffer) || theBufferList().isInternal(buffer))
buffer->undo().endUndoGroup(); buffer->undo().endUndoGroup();
break; break;
} }