commit 9b460043a7ecdac1ed1aee33a10d247bac4820bd
author Matteo Scandolo <matteo.scandolo@gmail.com> Fri Apr 14 16:24:45 2017 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Mon Apr 17 19:30:14 2017 -0700
tree ddd3667560e10cddc9374672f3b4f84de27f3f06
parent c817849d2fa67b84556ff0040529eaad34f745cc

[CORD-1117] XOS GUI Various fix

Change-Id: I4237a5e23509e9173c958d76aa929a70583ba1e6

src/app/core/services/keyboard-shortcut.ts

diff --git a/src/app/core/services/keyboard-shortcut.ts b/src/app/core/services/keyboard-shortcut.ts
index e814943..35af07e 100644
--- a/src/app/core/services/keyboard-shortcut.ts
+++ b/src/app/core/services/keyboard-shortcut.ts
@@ -120,7 +120,8 @@
 
     binding.key = binding.key.toLowerCase();
     if (_.find(this.keyMapping.global, {key: binding.key}) || _.find(this.keyMapping.view, {key: binding.key})) {
-      throw new Error(`[XosKeyboardShortcut] A shortcut for key "${binding.key}" has already been registered`);
+      this.$log.warn(`[XosKeyboardShortcut] A shortcut for key "${binding.key}" has already been registered`);
+      return;
     }
 
     this.$log.debug(`[XosKeyboardShortcut] Registering binding for key: ${binding.key}`);