anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash when dissolving a top level math inset

Browse Source 
This should be disabled not only for math hull, but also macro template.

Fixes bug #12562.
This commit is contained in:
Jean-Marc Lasgouttes 2022-06-29 22:52:16 +02:00
parent ae528715d3
commit c75522bbb7
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mathed/InsetMathNest.cpp
View File

@ -1275,13 +1275,16 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
cur.undispatched();
break;
}
case LFUN_INSET_DISSOLVE:
if (!asHullInset()) {
case LFUN_INSET_DISSOLVE: {
bool const enabled = cur.inMathed()
&& (&cur.inset() != this || cur[cur.depth() - 1].inset().inMathed());
if (enabled) {
cur.recordUndoInset();
// FIXME: this loses data
cur.pullArg();
}
break;
}
case LFUN_MATH_LIMITS: {
InsetMath * in = 0;
if (cur.pos() < cur.lastpos() && cur.nextMath().allowsLimitsChange())
@ -1497,10 +1500,13 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd,
break;
}
case LFUN_INSET_DISSOLVE:
flag.setEnabled(!asHullInset());
case LFUN_INSET_DISSOLVE: {
// Do not dissolve a math inset which is in text
bool const enabled = cur.inMathed()
&& (&cur.inset() != this || cur[cur.depth() - 1].inset().inMathed());
flag.setEnabled(enabled);
break;
}
case LFUN_PASTE: {
docstring const & name = cmd.argument();
if (name == "html" || name == "latex")