From 32b65ce8ec4c39721c40432bdc17eee892a3d5f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20P=C3=B6nitz?= Date: Thu, 6 Nov 2003 11:56:10 +0000 Subject: [PATCH] fix a few 'OUT OF SYNC' git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8055 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/cursor.C | 7 +++++-- src/insets/insettext.C | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/cursor.C b/src/cursor.C index 3c472d3a06..e6c8973008 100644 --- a/src/cursor.C +++ b/src/cursor.C @@ -120,8 +120,11 @@ void LCursor::push(InsetOld * inset, LyXText * text) void LCursor::pop() { - BOOST_ASSERT(!data_.empty()); - data_.pop_back(); + //BOOST_ASSERT(!data_.empty()); + if (data_.empty()) + lyxerr << "### TRYING TO POP FROM EMPTY CURSOR" << endl; + else + data_.pop_back(); } diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 4963779a62..e90fcb85ae 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -17,6 +17,7 @@ #include "bufferparams.h" #include "BufferView.h" #include "CutAndPaste.h" +#include "cursor.h" #include "debug.h" #include "dispatchresult.h" #include "errorlist.h" @@ -719,6 +720,7 @@ InsetText::priv_dispatch(FuncRequest const & cmd, if (result.val() >= FINISHED) { updateLocal(bv, false); bv->unlockInset(this); + bv->cursor().pop(); } break; case FINISHED_DOWN: @@ -726,6 +728,7 @@ InsetText::priv_dispatch(FuncRequest const & cmd, if (result.val() >= FINISHED) { updateLocal(bv, false); bv->unlockInset(this); + bv->cursor().pop(); } break; default: @@ -951,6 +954,7 @@ InsetText::priv_dispatch(FuncRequest const & cmd, if (result.val() >= FINISHED) { result.val(NONE); bv->unlockInset(this); + bv->cursor().pop(); } return result; -- 2.39.2