aboutsummaryrefslogtreecommitdiff
path: root/ui/vnc.c
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2017-12-18 19:12:17 +0000
committerGerd Hoffmann <kraxel@redhat.com>2018-01-12 13:48:53 +0100
commitc53df961617736f94731d94b62c2954c261d2bae (patch)
tree0cbe4155accdb93f0a3fab3017c8eaf65cee4b6b /ui/vnc.c
parent6af998db05aec9af95a06f84ad94f1b96785e667 (diff)
ui: remove unreachable code in vnc_update_client
A previous commit: commit 5a8be0f73d6f60ff08746377eb09ca459f39deab Author: Gerd Hoffmann <kraxel@redhat.com> Date: Wed Jul 13 12:21:20 2016 +0200 vnc: make sure we finish disconnect Added a check for vs->disconnecting at the very start of the vnc_update_client method. This means that the very next "if" statement check for !vs->disconnecting always evaluates true, and is thus redundant. This in turn means the vs->disconnecting check at the very end of the method never evaluates true, and is thus unreachable code. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Reviewed-by: Darren Kenny <darren.kenny@oracle.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-id: 20171218191228.31018-3-berrange@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui/vnc.c')
-rw-r--r--ui/vnc.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/ui/vnc.c b/ui/vnc.c
index d72a61bde3..29a7208475 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -969,7 +969,7 @@ static int vnc_update_client(VncState *vs, int has_dirty)
}
vs->has_dirty += has_dirty;
- if (vs->need_update && !vs->disconnecting) {
+ if (vs->need_update) {
VncDisplay *vd = vs->vd;
VncJob *job;
int y;
@@ -1030,10 +1030,6 @@ static int vnc_update_client(VncState *vs, int has_dirty)
return n;
}
- if (vs->disconnecting) {
- vnc_disconnect_finish(vs);
- }
-
return 0;
}