summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIzik Eidus <ieidus@redhat.com>2009-10-22 15:17:11 +0200
committerYaniv Kamay <ykamay@redhat.com>2009-10-25 13:52:18 +0200
commit85bcce83312fc1adf29e11841400c7af57243995 (patch)
tree29f9587090347800152786a5ac126b659d8a8b9a
parentc1b79eb035fa158fb2ac3bc8e559809611070016 (diff)
downloadspice-85bcce83312fc1adf29e11841400c7af57243995.tar.gz
spice-85bcce83312fc1adf29e11841400c7af57243995.tar.xz
spice-85bcce83312fc1adf29e11841400c7af57243995.zip
spice xclient: move xsync() to be at the right place.
Signed-off-by: Izik Eidus <ieidus@redhat.com>
-rw-r--r--client/x11/red_pixmap_cairo.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/client/x11/red_pixmap_cairo.cpp b/client/x11/red_pixmap_cairo.cpp
index c1454865..d15c35c3 100644
--- a/client/x11/red_pixmap_cairo.cpp
+++ b/client/x11/red_pixmap_cairo.cpp
@@ -90,13 +90,6 @@ RedPixmapCairo::RedPixmapCairo(int width, int height, RedPixmap::Format format,
THROW("XShmAttach failed");
}
- /*
- * Workaround for weird problem that is seen in Fedora 10/11,
- * spice get bad access error, but I am not sure if the bug is in spice or in X
- * for now just use this workaround.
- */
- XSync(XPlatform::get_display(), False);
-
((PixelsSource_p*)get_opaque())->x_shm_drawable.x_image = image;
((PixelsSource_p*)get_opaque())->x_shm_drawable.shminfo = shminfo;
_data = (uint8_t *)shminfo->shmaddr;
@@ -190,6 +183,7 @@ RedPixmapCairo::~RedPixmapCairo()
XShmSegmentInfo *shminfo = ((PixelsSource_p*)get_opaque())->x_shm_drawable.shminfo;
XShmDetach(XPlatform::get_display(), shminfo);
XDestroyImage(((PixelsSource_p*)get_opaque())->x_shm_drawable.x_image);
+ XSync(XPlatform::get_display(), False);
shmdt(shminfo->shmaddr);
delete shminfo;
}