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

Fix bug #10316.

Browse Source 
By sending the request through the usual dispatch machinery, we
make sure the cursor is valid when we're done.

(cherry picked from commit e5b6be0712)
This commit is contained in:
Richard Kimberly Heck 2020-03-02 23:57:08 -05:00
parent 0fde27465d
commit a355cd82c2
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/frontends/qt4/TocWidget.cpp
View File

@ -179,7 +179,6 @@ bool TocWidget::getStatus(Cursor & cur, FuncRequest const & cmd,
void TocWidget::doDispatch(Cursor & cur, FuncRequest const & cmd) void TocWidget::doDispatch(Cursor & cur, FuncRequest const & cmd)
{ {
Inset * inset = itemInset(); Inset * inset = itemInset();
FuncRequest tmpcmd(cmd);
QModelIndex const & index = tocTV->currentIndex(); QModelIndex const & index = tocTV->currentIndex();
TocItem const & item = TocItem const & item =
@ -191,14 +190,25 @@ void TocWidget::doDispatch(Cursor & cur, FuncRequest const & cmd)
switch (cmd.action()) switch (cmd.action())
{ {
case LFUN_CHANGE_ACCEPT: case LFUN_CHANGE_ACCEPT:
case LFUN_CHANGE_REJECT: case LFUN_CHANGE_REJECT: {
// The action is almost always LYX_UNKNOWN_ACTION, which will
// have the effect of moving the cursor to the location of
// the change. (See TocItem::action.)
dispatch(item.action()); dispatch(item.action());
cur.dispatch(tmpcmd); // If we do not reset the origin, then the request will be sent back
// here, and we are in an infinite loop. But we need the dispatch
// machinery to clean up for us, if the cursor is in an inset that
// will be deleted. See bug #10316.
FuncRequest tmpcmd(cmd);
tmpcmd.setOrigin(FuncRequest::INTERNAL);
dispatch(tmpcmd);
cur.forceBufferUpdate();
break; break;
}
case LFUN_SECTION_SELECT: case LFUN_SECTION_SELECT:
dispatch(item.action()); dispatch(item.action());
cur.dispatch(tmpcmd); cur.dispatch(cmd);
// necessary to get the selection drawn. // necessary to get the selection drawn.
cur.buffer()->changed(true); cur.buffer()->changed(true);
gui_view_.setFocus(); gui_view_.setFocus();
@ -219,10 +229,12 @@ void TocWidget::doDispatch(Cursor & cur, FuncRequest const & cmd)
outline(cmd.action()); outline(cmd.action());
break; break;
default: default: {
FuncRequest tmpcmd(cmd);
if (inset) if (inset)
inset->dispatch(cur, tmpcmd); inset->dispatch(cur, tmpcmd);
} }
}
cur.endUndoGroup(); cur.endUndoGroup();
} }

3
status.23x
View File

@ -43,6 +43,9 @@ What's new
- Fix problem with drawing of auto-opened insets (bug 11870). - Fix problem with drawing of auto-opened insets (bug 11870).
- Fix crash when rejecting changes and the cursor is in an inset that will be
deleted (bug 10316).
* INTERNALS * INTERNALS