diff options
author | Hans de Goede <hdegoede@redhat.com> | 2013-03-21 12:36:14 +0100 |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2013-03-21 17:25:35 +0100 |
commit | f7c11ac89989e897e6b75f96106a9477808fe1b9 (patch) | |
tree | 0acc1d3309edf574fef2a20b072729ffff7266c3 | |
parent | 9893c2383047270e88067fd94d6337f6904ff5ff (diff) | |
download | virt-viewer-f7c11ac89989e897e6b75f96106a9477808fe1b9.tar.gz virt-viewer-f7c11ac89989e897e6b75f96106a9477808fe1b9.tar.xz virt-viewer-f7c11ac89989e897e6b75f96106a9477808fe1b9.zip |
virt-viewer-window: Don't use priv->display when it is NULL
Add some missing checks for not having a display. Note that where
functions should not be called (ie menu items should be disabled) I've
used g_return_if_fail.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r-- | src/virt-viewer-window.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c index 80ba322..b0cf078 100644 --- a/src/virt-viewer-window.c +++ b/src/virt-viewer-window.c @@ -594,6 +594,8 @@ virt_viewer_window_menu_send(GtkWidget *menu, const char *text = gtk_label_get_label(GTK_LABEL(label)); VirtViewerWindowPrivate *priv = self->priv; + g_return_if_fail(priv->display != NULL); + for (i = 0 ; i < G_N_ELEMENTS(keyCombos) ; i++) { if (!strcmp(text, keyCombos[i].label)) { DEBUG_LOG("Sending key combo %s", gtk_label_get_text(GTK_LABEL(label))); @@ -768,7 +770,8 @@ virt_viewer_window_menu_view_resize(GtkWidget *menu, priv->auto_resize = FALSE; } - virt_viewer_display_set_auto_resize(priv->display, priv->auto_resize); + if (priv->display) + virt_viewer_display_set_auto_resize(priv->display, priv->auto_resize); } static void add_if_writable (GdkPixbufFormat *data, GHashTable *formats) @@ -903,6 +906,7 @@ G_MODULE_EXPORT void virt_viewer_window_menu_view_release_cursor(GtkWidget *menu G_GNUC_UNUSED, VirtViewerWindow *self) { + g_return_if_fail(self->priv->display != NULL); virt_viewer_display_release_cursor(VIRT_VIEWER_DISPLAY(self->priv->display)); } |