pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-26 21:37:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vnc: no dialog for server-closed-connection error

Browse Source 
Following commit de5cd71, when the server closes the connection
(likely when qemu-kvm exits), a dialog is shown to the user.

This behavior change is not good for automatic tests that expect
virt-viewer to exit without any dialog.

This patch makes sure no dialog is shown for this error, by
checking if the VNC connection was already initialized.

Signed-off-by: Uri Lublin <uril@redhat.com>
This commit is contained in:
Uri Lublin 2021-01-17 19:25:57 +02:00
parent 696b835911
commit 74fdd26c94
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/virt-viewer-app.c
View File

@ -139,6 +139,7 @@ struct _VirtViewerAppPrivate {
gboolean kiosk;
gboolean vm_ui;
gboolean vm_running;
gboolean initialized;
VirtViewerSession *session;
gboolean active;
@ -1651,6 +1652,7 @@ virt_viewer_app_deactivate(VirtViewerApp *self, gboolean connect_error)
virt_viewer_session_close(VIRT_VIEWER_SESSION(priv->session));
}
priv->initialized = FALSE;
priv->connected = FALSE;
priv->active = FALSE;
priv->started = FALSE;
@ -1689,6 +1691,7 @@ static void
virt_viewer_app_initialized(VirtViewerSession *session G_GNUC_UNUSED,
VirtViewerApp *self)
{
self->priv->initialized = TRUE;
virt_viewer_app_update_title(self);
}
@ -1727,7 +1730,10 @@ virt_viewer_app_error(VirtViewerSession *session G_GNUC_UNUSED,
{
VirtViewerAppPrivate *priv = self->priv;
priv->connected = FALSE; /* display error dialog */
/* Do not open a dialog if the connection was initialized
* This happens when the VNC server closes the connection */
if (!priv->initialized)
priv->connected = FALSE; /* display error dialog */
virt_viewer_app_disconnected(session, msg, self);
}