diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-20 07:50:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-20 07:50:24 +0000 |
| commit | 3799f1085abb02c5721f4c33f42c063edb68029d (patch) | |
| tree | 8a7f504e9bd1099a8508d4ffe2eda47ad9f5c452 /xorg-server/hw/xquartz/xpr/xprFrame.c | |
| parent | 07d3578ce63d87c9a87d54d85f5c8057d30fdc58 (diff) | |
| parent | 0ef233ddca61b9f3c72aa5f806ee818348f3aa20 (diff) | |
| download | vcxsrv-3799f1085abb02c5721f4c33f42c063edb68029d.tar.gz vcxsrv-3799f1085abb02c5721f4c33f42c063edb68029d.tar.bz2 vcxsrv-3799f1085abb02c5721f4c33f42c063edb68029d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/xpr/xprFrame.c')
| -rw-r--r-- | xorg-server/hw/xquartz/xpr/xprFrame.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/xorg-server/hw/xquartz/xpr/xprFrame.c b/xorg-server/hw/xquartz/xpr/xprFrame.c index 52925339f..5a40cbf41 100644 --- a/xorg-server/hw/xquartz/xpr/xprFrame.c +++ b/xorg-server/hw/xquartz/xpr/xprFrame.c @@ -206,13 +206,16 @@ xprCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen, static void
xprDestroyFrame(RootlessFrameID wid)
{
+ xp_error err;
TA_SERVER();
pthread_mutex_lock(&window_hash_mutex);
x_hash_table_remove(window_hash, wid);
pthread_mutex_unlock(&window_hash_mutex);
- xp_destroy_window(x_cvt_vptr_to_uint(wid));
+ err = xp_destroy_window(x_cvt_vptr_to_uint(wid));
+ if (err != Success)
+ FatalError("Could not destroy window %i.", (int)x_cvt_vptr_to_uint(wid));
}
@@ -366,9 +369,12 @@ xprStartDrawing(RootlessFrameID wid, char **pixelData, int *bytesPerRow) static void
xprStopDrawing(RootlessFrameID wid, Bool flush)
{
+ xp_error err;
TA_SERVER();
- xp_unlock_window(x_cvt_vptr_to_uint(wid), flush);
+ err = xp_unlock_window(x_cvt_vptr_to_uint(wid), flush);
+ if(err != Success)
+ FatalError("Could not unlock window %i after drawing.", (int)x_cvt_vptr_to_uint(wid));
}
|