Fix: aborting a ctrl-v (paste) with escape did leave copied objects on top of previous if no second Esc was pressed
This commit is contained in:
parent
010a31d779
commit
48968f0e71
|
|
@ -169,6 +169,11 @@ void abort_operation(void)
|
|||
xctx->ui_state &= ~PLACE_SYMBOL;
|
||||
xctx->ui_state &= ~PLACE_TEXT;
|
||||
}
|
||||
if(xctx->ui_state & STARTMERGE) {
|
||||
delete(1/* to_push_undo */);
|
||||
xctx->ui_state &= ~STARTMERGE;
|
||||
set_modify(0); /* aborted merge: no change, so reset modify flag set by delete() */
|
||||
}
|
||||
return;
|
||||
}
|
||||
if(xctx->ui_state & STARTCOPY)
|
||||
|
|
|
|||
Loading…
Reference in New Issue