add config.h

[lyx.git] / src / lyxfind.C

diff --git a/src/lyxfind.C b/src/lyxfind.C
index 9e92f3b63b64db4b1b4a75d885e80307e4424520..932cbec30e0a31df48b9cd37ab980a076802070f 100644 (file)
--- a/src/lyxfind.C
+++ b/src/lyxfind.C
@@ -29,7 +29,6 @@
 #include "undo.h"
 
 #include "frontends/Alert.h"
-#include "frontends/Selection.h"
 
 #include "support/convert.h"
 #include "support/docstream.h"
@@ -348,16 +347,24 @@ bool findNextChange(BufferView * bv)
        Change orig_change = cur.paragraph().lookupChange(cur.pos());
 
        DocIterator et = doc_iterator_end(cur.inset());
+       DocIterator ok = cur;   // see below
        for (; cur != et; cur.forwardPosNoDescend()) {
+               ok = cur;
                Change change = cur.paragraph().lookupChange(cur.pos());
                if (change != orig_change) {
                        break;
                }
        }
+
+       // avoid crash (assertion violation) if the imaginary end-of-par
+       // character of the last paragraph of the document is marked as changed 
+       if (cur == et) {
+               cur = ok;
+       }
+
        // Now put cursor to end of selection:
        bv->cursor().setCursor(cur);
        bv->cursor().setSelection();
-       theSelection().haveSelection(bv->cursor().selection());
 
        return true;
 }