aboutsummaryrefslogtreecommitdiffstats
path: root/src/custom.c
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2013-02-04 20:11:58 +0100
committerLukas Fleischer <calcurse@cryptocrack.de>2013-02-04 20:11:58 +0100
commitb30ccc6319a7bc091bd770c0d4f78985658e92aa (patch)
tree549094f77e6f1eeffc3294cd2dd56a70e881e81e /src/custom.c
parent308ba7c983c34c9b9b7d46f360f689b609c1f802 (diff)
parenta7944d335e9d005e6bbf6f521a5216f98318a131 (diff)
downloadcalcurse-b30ccc6319a7bc091bd770c0d4f78985658e92aa.tar.gz
calcurse-b30ccc6319a7bc091bd770c0d4f78985658e92aa.zip
Merge branch 'maint'
Diffstat (limited to 'src/custom.c')
-rw-r--r--src/custom.c8
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;