Merge branch 'maint'

1 files changed, 7 insertions, 1 deletions

diff --git a/src/custom.c b/src/custom.c
index 8eb3ef0..df344c2 100644
--- a/src/custom.c
+++ b/src/custom.c
@@ -1,7 +1,7 @@
 /*
  * Calcurse - text-based organizer
  *
- * Copyright (c) 2004-2012 calcurse Development Team <misc@calcurse.org>
+ * Copyright (c) 2004-2013 calcurse Development Team <misc@calcurse.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -979,6 +979,12 @@ void custom_keys_config(void)
         } else
           not_recognized = 0;
 
+        /* Is the binding used by this action already? If so, just end the reassignment */
+        if (selrow == keys_get_action(keyval)) {
+          delwin(grabwin);
+          break;
+        }
+
         used = keys_assign_binding(keyval, selrow);
         if (used) {
           enum key action;