Overhaul (no)limits support

[features.git] / src / mathed / InsetMathNest.cpp

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 8974d2c985465e8100d9798ad457b5e2ba9bf4a4..44f4a26805663e2976f5b44fe0c9f878e3d37e74 100644 (file)
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -1299,10 +1299,12 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
                                in->limits(NO_LIMITS);
                        else
                                in->limits(AUTO_LIMITS);
-               } else if (in->limits() == AUTO_LIMITS)
-                       in->limits(in->defaultLimits() == LIMITS ? NO_LIMITS : LIMITS);
-               else
+               } else if (in->limits() != AUTO_LIMITS)
                        in->limits(AUTO_LIMITS);
+               else if (in->defaultLimits(cur.cell().displayStyle()) == LIMITS)
+                       in->limits(NO_LIMITS);
+               else
+                       in->limits(LIMITS);
                return;
        }