Amend f441590c

[lyx.git] / src / frontends / qt4 / FindAndReplace.cpp

diff --git a/src/frontends/qt4/FindAndReplace.cpp b/src/frontends/qt4/FindAndReplace.cpp
index 8898cd975d8f8aa3d0516e1aa52f405a98512466..f40666c39bfa34143babfbe8b06166a4ecb44a0b 100644 (file)
--- a/src/frontends/qt4/FindAndReplace.cpp
+++ b/src/frontends/qt4/FindAndReplace.cpp
@@ -340,6 +340,8 @@ bool FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt, bool
                }
        }
 
+       UndoGroupHelper helper(buf);
+
        do {
                LYXERR(Debug::FIND, "Dispatching LFUN_WORD_FINDADV");
                dispatch(cmd);
@@ -384,6 +386,9 @@ bool FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt, bool
                if (buf != &view_.documentBufferView()->buffer())
                        lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
                                                  buf->absFileName()));
+
+               helper.resetBuffer(buf);
+
                bv = view_.documentBufferView();
                if (opt.forward) {
                        bv->cursor().clear();
@@ -397,6 +402,7 @@ bool FindAndReplaceWidget::findAndReplaceScope(FindAndReplaceOptions & opt, bool
                }
                bv->clearSelection();
        } while (wrap_answer != 1);
+
        if (buf_orig != &view_.documentBufferView()->buffer())
                lyx::dispatch(FuncRequest(LFUN_BUFFER_SWITCH,
                                          buf_orig->absFileName()));