Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-25 05:33:11 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Incorrect joystick id was returned on an inactive ARVR controller

Browse Source
This commit is contained in:
Bastiaan Olij 2020-01-22 18:27:32 +11:00
parent 5127afa812
commit 5cf9f4faeb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/3d/arvr_nodes.cpp
View File

@ -295,7 +295,8 @@ int ARVRController::get_joystick_id() const {
ARVRPositionalTracker *tracker = arvr_server->find_by_type_and_id(ARVRServer::TRACKER_CONTROLLER, controller_id);
if (tracker == NULL) {
return 0;
// No tracker? no joystick id... (0 is our first joystick)
return -1;
};
return tracker->get_joy_id();