[Spice-commits] server/main-channel-client.c

[Jonathon Jongsma]

 server/main-channel-client.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit b8080dbc21141ecf0c22b3e2d556a1f712929426
Author: Jonathon Jongsma <jjongsma at redhat.com>
Date:   Tue Oct 11 16:59:42 2016 -0500

    Don't increment num_clients_mig_wait twice
    
    When MainChannelClient was split to a separate file, the responsibility
    for incrementing this field was supposed to belong to the MainChannel
    function (main_channel_connect_semi_seamless()), but by mistake it was
    incremented both there and in the client function
    (main_channel_client_connect_semi_seamless()).
    
    The bug was introduced in a11b785f191d2381932f8c1bb6281539f2afe483
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/main-channel-client.c b/server/main-channel-client.c
index 9966a38..0913028 100644
--- a/server/main-channel-client.c
+++ b/server/main-channel-client.c
@@ -704,7 +704,6 @@ void main_channel_client_migrate(RedChannelClient *rcc)
 gboolean main_channel_client_connect_semi_seamless(MainChannelClient *mcc)
 {
     RedChannelClient *rcc = RED_CHANNEL_CLIENT(mcc);
-    MainChannel* main_channel = (MainChannel*)red_channel_client_get_channel(rcc);
     if (red_channel_client_test_remote_cap(rcc,
                                            SPICE_MAIN_CAP_SEMI_SEAMLESS_MIGRATE)) {
         RedClient *client = red_channel_client_get_client(rcc);
@@ -718,7 +717,6 @@ gboolean main_channel_client_connect_semi_seamless(MainChannelClient *mcc)
             mcc->priv->mig_wait_connect = TRUE;
         }
         mcc->priv->mig_connect_ok = FALSE;
-        main_channel->num_clients_mig_wait++;
         return TRUE;
     }
     return FALSE;