From dfe19b786b1dbd91373f3381631365613b8fcbf7 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.burg@gmx.com>
Date: Thu, 14 May 2015 05:34:02 +0200
Subject: [PATCH] disable shortcut on conflict

previously old value was kept
---
 src/ce_editoroptions.pas | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ce_editoroptions.pas b/src/ce_editoroptions.pas
index 05913024..17a264a5 100644
--- a/src/ce_editoroptions.pas
+++ b/src/ce_editoroptions.pas
@@ -453,6 +453,8 @@ begin
           // try to find, if not match cur action, set to 0
           kst.ShortCut := shc.shortcut;
         except
+          kst.ShortCut := 0;
+          shc.shortcut := 0;
           // TODO-cfeaure: manage shortcuts conflicts
           // either here or in the shortcut editor.
           // by default and if a conflict exists synedit will raise an exception here.