openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gtk: Don't crash if -nodefaults 

This fixes a crash by just skipping the vte resize hack if cur is NULL.

Reproducer:

qemu-system-x86_64 -nodefaults

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Fam Zheng 2014-11-21 09:59:09 +08:00 committed by Gerd Hoffmann
parent 8a0f9b5263
commit b310a2a609
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/gtk.c
View File

@ -1909,15 +1909,17 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover)
#ifdef VTE_RESIZE_HACK #ifdef VTE_RESIZE_HACK
{ {
VirtualConsole *cur = gd_vc_find_current(s); VirtualConsole *cur = gd_vc_find_current(s);
int i; if (cur) {
int i;
for (i = 0; i < s->nb_vcs; i++) { for (i = 0; i < s->nb_vcs; i++) {
VirtualConsole *vc = &s->vc[i]; VirtualConsole *vc = &s->vc[i];
if (vc && vc->type == GD_VC_VTE && vc != cur) { if (vc && vc->type == GD_VC_VTE && vc != cur) {
gtk_widget_hide(vc->vte.terminal); gtk_widget_hide(vc->vte.terminal);
}
} }
gd_update_windowsize(cur);
} }
gd_update_windowsize(cur);
} }
#endif #endif