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

Fixed infinite loop on backwards search when matching in nested inset(s) at begin of document.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32650 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Tommaso Cucinotta 2009-12-26 22:10:14 +00:00
parent 27d580b5c0
commit 569a0e4629
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lyxfind.cpp
View File

@ -1022,6 +1022,7 @@ int findBackwardsAdv(DocIterator & cur, MatchStringAdv const & match) {
else else
cur.pos() = cur_orig.pos(); cur.pos() = cur_orig.pos();
LYXERR(Debug::FIND, "findBackAdv2: cur: " << cur); LYXERR(Debug::FIND, "findBackAdv2: cur: " << cur);
DocIterator cur_prev_iter;
if (found_match) { if (found_match) {
while (true) { while (true) {
found_match=match(cur); found_match=match(cur);
@ -1031,12 +1032,14 @@ int findBackwardsAdv(DocIterator & cur, MatchStringAdv const & match) {
int len; int len;
findMostBackwards(cur, match, len); findMostBackwards(cur, match, len);
if (&cur.inset() != &cur_orig.inset() if (&cur.inset() != &cur_orig.inset()
|| !(cur.pit()==cur_orig.pit()) || !(cur.pit() == cur_orig.pit())
|| cur.pos() < cur_orig.pos()) || cur.pos() < cur_orig.pos())
return len; return len;
} }
if (cur == cur_begin) // Prevent infinite loop at begin of document
if (cur == cur_begin || cur == cur_prev_iter)
break; break;
cur_prev_iter = cur;
cur.backwardPos(); cur.backwardPos();
}; };
} }