From 6a15305fe46dc01a79f423e0422968c816c7425d Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sun, 16 Sep 2012 17:27:12 +0000
Subject: [PATCH] IDE: editor keymap return key: fixed crash

git-svn-id: trunk@38693 -
---
 ide/frames/editor_keymapping_options.pas | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ide/frames/editor_keymapping_options.pas b/ide/frames/editor_keymapping_options.pas
index 0024fa87bb..600f09a80b 100644
--- a/ide/frames/editor_keymapping_options.pas
+++ b/ide/frames/editor_keymapping_options.pas
@@ -286,7 +286,7 @@ end;
 
 procedure TEditorKeymappingOptionsFrame.TreeViewKeyPress(Sender: TObject; var Key: char);
 begin
-  if Key = char(VK_RETURN) then
+  if (Key = char(VK_RETURN)) and (TreeView.Selected<>nil) then
     EditCommandMapping(TreeView.Selected);
 end;