diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2015-06-05 13:07:58 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-06-11 11:37:56 +0200 |
| commit | 060ab76356fff6a420bc881a574c40a5dda086af (patch) | |
| tree | ffb9dc83c883c80a700b24a84d51d3c00521f5a3 /ui | |
| parent | 0e12e61ff9a3407d123d0dbc4d945aec98d60fdf (diff) | |
| download | focaccia-qemu-060ab76356fff6a420bc881a574c40a5dda086af.tar.gz focaccia-qemu-060ab76356fff6a420bc881a574c40a5dda086af.zip | |
gtk: don't exit early in case gtk init fails
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/ui/gtk.c b/ui/gtk.c index 126326ac7f..df2a79e7ac 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1917,12 +1917,19 @@ static void gd_set_keycode_type(GtkDisplayState *s) #endif } +static gboolean gtkinit; + void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover) { GtkDisplayState *s = g_malloc0(sizeof(*s)); char *filename; GdkDisplay *window_display; + if (!gtkinit) { + fprintf(stderr, "gtk initialization failed\n"); + exit(1); + } + s->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); #if GTK_CHECK_VERSION(3, 2, 0) s->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); @@ -2003,7 +2010,11 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover) void early_gtk_display_init(int opengl) { - gtk_init(NULL, NULL); + gtkinit = gtk_init_check(NULL, NULL); + if (!gtkinit) { + /* don't exit yet, that'll break -help */ + return; + } switch (opengl) { case -1: /* default */ |