From 331824c5370250fd99d058ad7274d319c4509a1c Mon Sep 17 00:00:00 2001 From: Martin Vermeer Date: Fri, 8 Apr 2005 12:15:28 +0000 Subject: [PATCH] Make Helge happy: no more crash on arrow up/down in math macro git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9792 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/mathed/ChangeLog | 5 +++++ src/mathed/math_nestinset.C | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 8dd46f4b05..8391e270cf 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,8 @@ +2005-04-07 Martin Vermeer + + * math_nestinset.C (doDispatch): Fix arrow up/down inside + macro crashing bug (Helge Hafting report) + 2005-04-07 Martin Vermeer * math_gridinset.C (getStatus): allow C-Tab to split cell diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C index 8f3f8cfb6c..79ca87f779 100644 --- a/src/mathed/math_nestinset.C +++ b/src/mathed/math_nestinset.C @@ -496,6 +496,12 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) case LFUN_UPSEL: case LFUN_UP: + // FIXME Tried to use clearTargetX and macroModeClose, crashed on cur.up() + if (cur.inMacroMode()) { + // Make Helge happy + cur.macroModeClose(); + break; + } cur.selHandle(cmd.action == LFUN_UPSEL); if (!cur.up()) cmd = FuncRequest(LFUN_FINISHED_UP); @@ -505,6 +511,10 @@ void MathNestInset::doDispatch(LCursor & cur, FuncRequest & cmd) case LFUN_DOWNSEL: case LFUN_DOWN: + if (cur.inMacroMode()) { + cur.macroModeClose(); + break; + } cur.selHandle(cmd.action == LFUN_DOWNSEL); if (!cur.down()) cmd = FuncRequest(LFUN_FINISHED_DOWN); -- 2.39.2