diff --git a/sunshine/input.cpp b/sunshine/input.cpp index d71384d1..4cf79030 100644 --- a/sunshine/input.cpp +++ b/sunshine/input.cpp @@ -6,8 +6,6 @@ extern "C" { #include } -#include - #include "main.h" #include "config.h" #include "input.h" @@ -134,14 +132,16 @@ void passthrough(std::shared_ptr &input, PNV_MULTI_CONTROLLER_PACKET pa platf::free_gamepad(input->input, x); } else if(platf::alloc_gamepad(input->input, x)) { - //TODO: abort stream session + // allocating a gamepad failed: solution: ignore gamepads + // The implementations of platf::alloc_gamepad already have logging + return; } } } input->active_gamepad_state = packet->activeGamepadMask; if(packet->controllerNumber < 0 || packet->controllerNumber >= input->gamepads.size()) { - BOOST_LOG(error) << "ControllerNumber out of range ["sv << packet->controllerNumber << ']'; + BOOST_LOG(warning) << "ControllerNumber out of range ["sv << packet->controllerNumber << ']'; return; } diff --git a/sunshine/platform/windows.cpp b/sunshine/platform/windows.cpp index 3be53c07..2d89ddc6 100755 --- a/sunshine/platform/windows.cpp +++ b/sunshine/platform/windows.cpp @@ -1,4 +1,3 @@ -#include #include #include