From a10f16cb3c618fd040a4e010ad5b914a0d900363 Mon Sep 17 00:00:00 2001 From: Marshall Polaris Date: Fri, 15 May 2020 21:24:16 -0700 Subject: [PATCH] Log errors while reading joystick input --- src/arch/InputHandler/InputHandler_Linux_Joystick.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp b/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp index d61c2082eb..38728d11dc 100644 --- a/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp +++ b/src/arch/InputHandler/InputHandler_Linux_Joystick.cpp @@ -140,6 +140,15 @@ void InputHandler_Linux_Joystick::InputThread() js_event event; int ret = read(fds[i], &event, sizeof(event)); + + if(ret == -1) + { + LOG->Warn("Error reading from joystick %i: %s; disabled", i, strerror(errno)); + close(fds[i]); + fds[i] = -1; + continue; + } + if(ret != sizeof(event)) { LOG->Warn("Unexpected packet (size %i != %i) from joystick %i; disabled", ret, (int)sizeof(event), i);