gcc compile fix: vector::insert() requires an iterator, not a const_iterator.

[lyx.git] / src / BufferView.cpp

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 054fadbbabab473aa0f3fbe0db7aca753e1b8f13..c9b03bd607068679b1b39284af7d616bfd251b63 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1188,6 +1188,10 @@ bool BufferView::dispatch(FuncRequest const & cmd)
                FuncRequest req = cmd;
                if (cmd.argument().empty() && !d->search_request_cache_.argument().empty())
                        req = d->search_request_cache_;
+               if (req.argument().empty()) {
+                       theLyXFunc().dispatch(FuncRequest(LFUN_DIALOG_SHOW, "findreplace"));
+                       break;
+               }
                if (find(this, req))
                        showCursor();
                else
@@ -1738,7 +1742,7 @@ void BufferView::setCursorFromRow(int row)
 bool BufferView::setCursorFromInset(Inset const * inset)
 {
        // are we already there?
-       if (cursor().nextInset() == inset)
+       if (&cursor().inset() == inset || cursor().nextInset() == inset)
                return true;
 
        // Inset is not at cursor position. Find it in the document.