summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Haas <liu.gam3@gmail.com>2016-08-28 17:14:21 +0200
committerAndreas Haas <liu.gam3@gmail.com>2016-08-28 17:14:40 +0200
commit02a8604906b1f50000f96e2f8dbd0d50a162ab6f (patch)
treed7c7ce20f313d0c50a19e3bef0f042d7925dbbda
parent6c674375e52e8228e2aec53ceb0ac3d3f4a0f4d9 (diff)
Fix crash when trying to access the guid of an unavailable Gamepad.
Throws an error now.
-rw-r--r--main/input_default.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp
index c655b409ff..f93a142c54 100644
--- a/main/input_default.cpp
+++ b/main/input_default.cpp
@@ -1055,6 +1055,7 @@ bool InputDefault::is_joy_mapped(int p_device) {
}
String InputDefault::get_joy_guid_remapped(int p_device) const {
+ ERR_FAIL_COND_V(!joy_names.has(p_device), "");
return joy_names[p_device].uid;
}