commit a75d6f07613af7ec5b016b31b117436e32ce7a5f
author Brandon Carpenter <brandon.carpenter@cypherpath.com> Tue Sep 12 08:21:47 2017 -0700
committer Daniel P. Berrange <berrange@redhat.com> Wed Oct 04 13:21:53 2017 +0100
tree 60e063eefa48a8535b57fac8d4ff39f5e4e7327f
parent 33badfd1e3735b877e41939100511c65572be6b9

ui: Always remove an old VNC channel watch before adding a new one

Also set saved handle to zero when removing without adding a new watch.

Signed-off-by: Brandon Carpenter <brandon.carpenter@cypherpath.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>

ui/vnc-auth-vencrypt.c

diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c
index f0bec20..7833631 100644
--- a/ui/vnc-auth-vencrypt.c
+++ b/ui/vnc-auth-vencrypt.c
@@ -75,6 +75,9 @@
         vnc_client_error(vs);
         error_free(err);
     } else {
+        if (vs->ioc_tag) {
+            g_source_remove(vs->ioc_tag);
+        }
         vs->ioc_tag = qio_channel_add_watch(
             vs->ioc, G_IO_IN | G_IO_OUT, vnc_client_io, vs, NULL);
         start_auth_vencrypt_subauth(vs);