summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaks Naumov <maksqwe1@ukr.net>2015-01-11 10:34:56 -0800
committerMatthias Clasen <mclasen@redhat.com>2015-01-11 14:33:10 -0500
commit430ea2fff639f31b868e025002a32ba473c7bd07 (patch)
tree0f0aaf15a7bf6a388bf4aece283542bbe2a6b8b2
parentf120ae7b4d418662f0aa9307c081abc261402311 (diff)
downloadgtk+-430ea2fff639f31b868e025002a32ba473c7bd07.tar.gz
Properly ignore BadWindow and BadDrawable in get_child_info_handler()
Signed-off-by: Maks Naumov <maksqwe1@ukr.net> https://bugzilla.gnome.org/show_bug.cgi?id=742771
-rw-r--r--gdk/x11/gdkasync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gdk/x11/gdkasync.c b/gdk/x11/gdkasync.c
index bcc6ac75a2..a0ad44a1d1 100644
--- a/gdk/x11/gdkasync.c
+++ b/gdk/x11/gdkasync.c
@@ -476,7 +476,7 @@ get_child_info_handler (Display *dpy,
if (rep->generic.type == X_Error)
{
state->child_has_error = TRUE;
- if (rep->error.errorCode != BadDrawable ||
+ if (rep->error.errorCode != BadDrawable &&
rep->error.errorCode != BadWindow)
{
state->have_error = TRUE;