diff --git a/sunshine/input.cpp b/sunshine/input.cpp index d0f40224..9652b2bf 100644 --- a/sunshine/input.cpp +++ b/sunshine/input.cpp @@ -460,7 +460,7 @@ void passthrough(PNV_SCROLL_PACKET packet) { platf::scroll(platf_input, util::endian::big(packet->scrollAmt1)); } -int updateGamepads(std::vector &gamepads, std::int16_t old_state, std::int16_t new_state, platf::rumble_queue_t rumble_queue) { +int updateGamepads(std::vector &gamepads, std::int16_t old_state, std::int16_t new_state, const platf::rumble_queue_t &rumble_queue) { auto xorGamepadMask = old_state ^ new_state; if(!xorGamepadMask) { return 0; @@ -486,7 +486,7 @@ int updateGamepads(std::vector &gamepads, std::int16_t old_state, std return -1; } - if(platf::alloc_gamepad(platf_input, id, std::move(rumble_queue))) { + if(platf::alloc_gamepad(platf_input, id, rumble_queue)) { free_id(gamepadMask, id); // allocating a gamepad failed: solution: ignore gamepads // The implementations of platf::alloc_gamepad already has logging diff --git a/sunshine/platform/common.h b/sunshine/platform/common.h index 4fe87b7c..7482f0ea 100644 --- a/sunshine/platform/common.h +++ b/sunshine/platform/common.h @@ -290,7 +290,7 @@ void scroll(input_t &input, int distance); void keyboard(input_t &input, uint16_t modcode, bool release); void gamepad(input_t &input, int nr, const gamepad_state_t &gamepad_state); -int alloc_gamepad(input_t &input, int nr, rumble_queue_t &&rumble_queue); +int alloc_gamepad(input_t &input, int nr, rumble_queue_t rumble_queue); void free_gamepad(input_t &input, int nr); #define SERVICE_NAME "Sunshine" diff --git a/sunshine/platform/windows/input.cpp b/sunshine/platform/windows/input.cpp index b637b0d6..88183f4b 100755 --- a/sunshine/platform/windows/input.cpp +++ b/sunshine/platform/windows/input.cpp @@ -326,7 +326,7 @@ void keyboard(input_t &input, uint16_t modcode, bool release) { send_input(i); } -int alloc_gamepad(input_t &input, int nr, rumble_queue_t &&rumble_queue) { +int alloc_gamepad(input_t &input, int nr, rumble_queue_t rumble_queue) { if(!input) { return 0; }