From 5f66773605b0a12f04d00179df22f2119b0c1ca5 Mon Sep 17 00:00:00 2001
From: TheFGFSEagle <thefgfseagle@gmail.com>
Date: Fri, 6 Oct 2023 20:17:25 +0200
Subject: [PATCH] canvas.Keybinding.parseShortcut: Accept nil and empty
 strings, returning nil

This can be used to unset the key binding of a Canvas menu item by using item.setShortcut(nil);
---
 Nasal/canvas/KeyBinding.nas | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Nasal/canvas/KeyBinding.nas b/Nasal/canvas/KeyBinding.nas
index 49f14a5a4..fe6df29e4 100644
--- a/Nasal/canvas/KeyBinding.nas
+++ b/Nasal/canvas/KeyBinding.nas
@@ -283,7 +283,7 @@ ModifierKeys.Meta = (ModifierKeys.Meta_L | ModifierKeys.Meta_R);
 
 var parseShortcut = func(s) 
 {
-	if (size(s) == 0) {
+	if (!s or !isstr(s) or size(s) == 0) {
 		return nil;
 	}
 	
@@ -315,6 +315,7 @@ var parseShortcut = func(s)
 
 	if (keyCode == nil) {
 		logprint(LOG_ALERT, "Unknown key '" ~ baseKey ~ "'");
+		return nil;
 	}
 
 	return  [modMask, keyCode];