pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-30 18:31:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

app: Do not show usbredir button without session

Browse Source 
The button is visible in the fullscreen toolbar when waiting for a guest.
Clicking on it causes the runtime warning:
virt-viewer-CRITICAL **: virt_viewer_session_usb_device_selection: assertion 'VIRT_VIEWER_IS_SESSION(self)' failed
This commit is contained in:
Pavel Grunt 2016-01-22 14:54:01 +01:00
parent 8c9a968561
commit 529980e8d3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -908,6 +908,13 @@ viewer_window_focus_out_cb(GtkWindow *window G_GNUC_UNUSED,
return FALSE;
}
static gboolean
virt_viewer_app_has_usbredir(VirtViewerApp *self)
{
return virt_viewer_app_has_session(self) &&
virt_viewer_session_get_has_usbredir(virt_viewer_app_get_session(self));
}
static VirtViewerWindow*
virt_viewer_app_window_new(VirtViewerApp *self, gint nth)
{
@ -926,10 +933,7 @@ virt_viewer_app_window_new(VirtViewerApp *self, gint nth)
self->priv->windows = g_list_append(self->priv->windows, window);
virt_viewer_app_set_window_subtitle(self, window, nth);
virt_viewer_app_update_menu_displays(self);
if (self->priv->session) {
virt_viewer_window_set_usb_options_sensitive(window,
virt_viewer_session_get_has_usbredir(self->priv->session));
}
virt_viewer_window_set_usb_options_sensitive(window, virt_viewer_app_has_usbredir(self));
g_signal_emit(self, signals[SIGNAL_WINDOW_ADDED], 0, window);