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

Do not crash when entering math in ct mode with merge dialog open.

Browse Source 
Fixes: #7685.
This commit is contained in:
Juergen Spitzmueller 2014-03-23 09:52:32 +01:00
parent 1c35155810
commit aceb9d9f29
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BufferView.cpp
View File

@ -684,6 +684,10 @@ Change const BufferView::getCurrentChange() const
return Change(Change::UNCHANGED);
DocIterator dit = d->cursor_.selectionBegin();
// The selected content might have been changed (see #7685)
while (dit.inMathed())
// Find enclosing text cursor
dit.pop_back();
return dit.paragraph().lookupChange(dit.pos());
}

3
status.20x
View File

@ -88,6 +88,9 @@ What's new
- Fix crash when navigating to next change (bug 8684).
- Fix crash when entering math in change-tracking mode while merge changes
dialog is open (bug 7685).
- Fix crash when optional argument inside a math macro was deleted
(bug 8329).