mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-23 05:25:26 +00:00
fix a few 'OUT OF SYNC'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8055 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
338b173b3c
commit
32b65ce8ec
@ -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();
|
||||
}
|
||||
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user