From e26ceb9b045f67f0fdfa4837d4fe4f0657c309e9 Mon Sep 17 00:00:00 2001 From: Anthony Pesch Date: Mon, 10 Aug 2015 12:57:45 -0700 Subject: [PATCH] fix crash when pressing keys that aren't in key map --- src/system/keys.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/system/keys.cc b/src/system/keys.cc index 206237a4..897783fa 100644 --- a/src/system/keys.cc +++ b/src/system/keys.cc @@ -351,6 +351,8 @@ Keycode dreavm::system::GetKeycodeByName(const char *keyname) { } const char *dreavm::system::GetNameByKeycode(Keycode keycode) { + static const char *unknown = "unknown"; + for (size_t i = 0, l = sizeof(keys) / sizeof(Key); i < l; i++) { const Key &key = keys[i]; @@ -359,5 +361,5 @@ const char *dreavm::system::GetNameByKeycode(Keycode keycode) { } } - return nullptr; + return unknown; }