pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-29 17:20:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ensure auto-conf is only done once

Browse Source 
Auto-conf should only happen at startup. It is triggered from several places due
to the somewhat unreliable ordering of events, but that doesn't mean we want to
run it several times. This patch ensures that we only do it once.
This commit is contained in:
Jonathon Jongsma 2013-11-08 14:53:28 -06:00
parent 764a504726
commit d9e14ff375
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/virt-viewer-session-spice.c
View File

@ -55,6 +55,7 @@ struct _VirtViewerSessionSpicePrivate {
int usbredir_channel_count;
gboolean has_sw_smartcard_reader;
guint pass_try;
gboolean did_auto_conf;
};
#define VIRT_VIEWER_SESSION_SPICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), VIRT_VIEWER_TYPE_SESSION_SPICE, VirtViewerSessionSpicePrivate))
@ -726,6 +727,13 @@ virt_viewer_session_spice_fullscreen_auto_conf(VirtViewerSessionSpice *self)
gint i;
gsize ndisplays = 0;
/* only do auto-conf once at startup. Avoid repeating auto-conf later due to
* agent disconnection/re-connection, etc */
if (self->priv->did_auto_conf) {
DEBUG_LOG("Already did auto-conf, skipping");
return FALSE;
}
app = virt_viewer_session_get_app(VIRT_VIEWER_SESSION(self));
g_return_val_if_fail(VIRT_VIEWER_IS_APP(app), TRUE);
@ -764,6 +772,7 @@ virt_viewer_session_spice_fullscreen_auto_conf(VirtViewerSessionSpice *self)
}
spice_main_send_monitor_config(cmain);
self->priv->did_auto_conf = TRUE;
return TRUE;
}