Fixed #6555 (crash when trying to replace starting from multi-par selection with...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33542 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index f4b2a463fff3524b1040a8d2e524af0309781e93..8ec3f57cfa7de12e029ce7d5bbd8dd107478e32b 100644 (file)
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -1137,9 +1137,12 @@ static void findAdvReplace(BufferView * bv, FindAndReplaceOptions const & opt, M
                return;
        DocIterator sel_beg = cur.selectionBegin();
        DocIterator sel_end = cur.selectionEnd();
-       LASSERT(&sel_beg.inset() == &sel_end.inset(), /**/);
+       if (&sel_beg.inset() != &sel_end.inset()
+           || sel_beg.pit() != sel_end.pit())
+               return;
        int sel_len = sel_end.pos() - sel_beg.pos();
-       LYXERR(Debug::FIND, "sel_beg: " << sel_beg << ", sel_end: " << sel_end << ", sel_len: " << sel_len << endl);
+       LYXERR(Debug::FIND, "sel_beg: " << sel_beg << ", sel_end: " << sel_end
+              << ", sel_len: " << sel_len << endl);
        if (sel_len == 0)
                return;
        LASSERT(sel_len > 0, /**/);