[LyX/master] Avoid duplicating mode changing commands

[Enrico Forestieri]

commit 5cdbaf51ee73e23b9c0dfd6e8a9aa5fea1d798de
Author: Enrico Forestieri <for...@lyx.org>
Date:   Sat Sep 10 02:39:57 2016 +0200

    Avoid duplicating mode changing commands
---
 src/Cursor.cpp |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 6f1a194..4e63734 100644
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -1450,13 +1450,15 @@ bool Cursor::macroModeClose()
                atom.nucleus()->cell(0).append(selection);
 
        if (in->currentMode() == Inset::TEXT_MODE
-           && atom.nucleus()->currentMode() == Inset::MATH_MODE) {
+           && atom.nucleus()->currentMode() == Inset::MATH_MODE
+           && name != from_ascii("ensuremath")) {
                MathAtom at(new InsetMathEnsureMath(buffer()));
                at.nucleus()->cell(0).push_back(atom);
                niceInsert(at);
                posForward();
        } else if (in->currentMode() == Inset::MATH_MODE
-                  && atom.nucleus()->currentMode() == Inset::TEXT_MODE) {
+                  && atom.nucleus()->currentMode() == Inset::TEXT_MODE
+                  && name != from_ascii("text")) {
                MathAtom at = createInsetMath("text", buffer());
                at.nucleus()->cell(0).push_back(atom);
                niceInsert(at);