From 79b4e45ebe3a61f9b5937ad226eead9eebce87ac Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 13 Jun 2014 19:15:08 +0100 Subject: [PATCH] intel-virtual-output: Only call XShmDetach on a valid SHM segment Saves a couple of extraneous XErrors. Signed-off-by: Chris Wilson --- tools/virtual.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/virtual.c b/tools/virtual.c index 4b1c9684..0d54393b 100644 --- a/tools/virtual.c +++ b/tools/virtual.c @@ -1091,12 +1091,12 @@ static int clone_init_xfer(struct clone *clone) DisplayString(clone->dst.dpy), clone->dst.name, width, height)); - if (clone->src.use_shm) - XShmDetach(clone->src.dpy, &clone->src.shm); - if (clone->dst.use_shm) - XShmDetach(clone->dst.dpy, &clone->dst.shm); - if (clone->shm.shmaddr) { + if (clone->src.use_shm) + XShmDetach(clone->src.dpy, &clone->src.shm); + if (clone->dst.use_shm) + XShmDetach(clone->dst.dpy, &clone->dst.shm); + shmdt(clone->shm.shmaddr); clone->shm.shmaddr = NULL; }