Bug fix B2012-334, program would sometimes terminate when using the Enter key to enter step data

This commit is contained in:
John Jenko 2012-12-04 15:32:52 +00:00
parent 3b0062bc7e
commit a6e07e9b52

View File

@ -1806,7 +1806,8 @@ namespace Volian.Controls.Library
InsertSiblingBeforeOrAfter("after"); InsertSiblingBeforeOrAfter("after");
else if (deletedRNO) else if (deletedRNO)
{ {
if (MyItemInfo.SearchNext.IsTable)
if (MyItemInfo.SearchNext != null && MyItemInfo.SearchNext.IsTable)
MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown); MyStepRTB.StepRTB_ArrowPressed(E_ArrowKeys.CtrlDown);
else else
InsertSiblingBeforeOrAfter("after"); InsertSiblingBeforeOrAfter("after");
@ -1846,7 +1847,7 @@ namespace Volian.Controls.Library
{ {
if (deletedSubStep) if (deletedSubStep)
SetShortCutContextMenu("InsHLS"); SetShortCutContextMenu("InsHLS");
else if (next.IsFirstSubStep) else if (next != null && next.IsFirstSubStep)
{ {
MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(next); MyEditItem.MyStepPanel.MyStepTabPanel.MyDisplayTabControl.OpenItem(next);
InsertSiblingBeforeOrAfter("before"); InsertSiblingBeforeOrAfter("before");