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

Compare: Actually abort the process when cancel is pressed.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33020 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-01-14 00:56:55 +00:00
parent 326ab92c21
commit aa2fac50eb
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Compare.cpp
View File

@ -651,6 +651,8 @@ int Compare::Impl::findMiddleSnake(DocRangePair const & rp,
return 2 * D - odd_offset_;
}
}
if (abort_)
return 0;
}
}
}
@ -695,6 +697,9 @@ bool Compare::Impl::diff(Buffer const * new_buf, Buffer const * old_buf,
void Compare::Impl::diff_i(DocRangePair const & rp)
{
if (abort_)
return;
// The middle snake
DocPair middle_snake;