diff options
| author | Bastiaan Olij <mux213@gmail.com> | 2020-01-22 18:27:32 +1100 |
|---|---|---|
| committer | Bastiaan Olij <mux213@gmail.com> | 2020-01-22 18:27:32 +1100 |
| commit | 5cf9f4faeba21113a8e976c318dc9b3b3ba39d8e (patch) | |
| tree | 57fc96096ca77d4f4d257a34e1cc13f2a6fe0f12 | |
| parent | 5127afa812f80c02e6f9fada854d46482daafca4 (diff) | |
Incorrect joystick id was returned on an inactive ARVR controller
| -rw-r--r-- | scene/3d/arvr_nodes.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/3d/arvr_nodes.cpp b/scene/3d/arvr_nodes.cpp index 82293268b9..f0aaba1065 100644 --- a/scene/3d/arvr_nodes.cpp +++ b/scene/3d/arvr_nodes.cpp @@ -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(); |