From 6c900f0442939321cd986e35e26e6cb6c640eed2 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Fri, 29 May 2020 16:21:20 +0100 Subject: [PATCH] inputs-channel-client: Avoid attribute shadowing This regression was caused by commit "2ffa7d00c60808e2f640df9bc9b5d62598455588" (cfr "Improve encapsulation for InputsChannelClient") Signed-off-by: Frediano Ziglio Acked-by: Julien Rope --- server/inputs-channel-client.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/inputs-channel-client.cpp b/server/inputs-channel-client.cpp index 31f22b9e..0c8ff0cf 100644 --- a/server/inputs-channel-client.cpp +++ b/server/inputs-channel-client.cpp @@ -69,9 +69,9 @@ void InputsChannelClient::send_migrate_data(SpiceMarshaller *m, RedPipeItem *ite spice_marshaller_add_uint16(m, motion_count); } -void InputsChannelClient::handle_migrate_data(uint16_t motion_count) +void InputsChannelClient::handle_migrate_data(uint16_t new_motion_count) { - motion_count = motion_count; + motion_count = new_motion_count; for (; motion_count >= SPICE_INPUT_MOTION_ACK_BUNCH; motion_count -= SPICE_INPUT_MOTION_ACK_BUNCH) {