summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorGerd Hoffmann2018-03-14 09:04:39 +0100
committerGerd Hoffmann2018-04-10 11:22:02 +0200
commitfa2d039b2cda314e83cc9fd8fd5b9d41c09a0993 (patch)
tree40fb4dc5c9dcbf73dcc260ddcefc905989e00abe /ui
parentui: fix keymap detection under Xwayland (diff)
downloadqemu-fa2d039b2cda314e83cc9fd8fd5b9d41c09a0993.tar.gz
qemu-fa2d039b2cda314e83cc9fd8fd5b9d41c09a0993.tar.xz
qemu-fa2d039b2cda314e83cc9fd8fd5b9d41c09a0993.zip
gtk: drop pointless code from gd_window_close
Unregistering the display change listener looks like a pointless excercise given we'll exit in a moment. When exiting qemu via menu/file/quit this will not happen either. Just drop the code. Also return TRUE unconditionally. This will tell gtk to ignore the close request, so gtk will not start destroying widgets and causing warnings due to UI code trying to talk to widgets which are gone. Just depend on qmp_quit() doing it's job instead. Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-Id: <20180314080439.4229-1-kraxel@redhat.com>
Diffstat (limited to 'ui')
-rw-r--r--ui/gtk.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/ui/gtk.c b/ui/gtk.c
index e98ac4d2fc..bb3214cffb 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -786,21 +786,13 @@ static gboolean gd_window_close(GtkWidget *widget, GdkEvent *event,
{
GtkDisplayState *s = opaque;
bool allow_close = true;
- int i;
if (s->opts->has_window_close && !s->opts->window_close) {
allow_close = false;
}
if (allow_close) {
- for (i = 0; i < s->nb_vcs; i++) {
- if (s->vc[i].type != GD_VC_GFX) {
- continue;
- }
- unregister_displaychangelistener(&s->vc[i].gfx.dcl);
- }
qmp_quit(NULL);
- return FALSE;
}
return TRUE;