[MPlayer-cvslog] CVS: main/libvo x11_common.c,1.188,1.189
Alexander Strasser beastd
syncmail at mplayerhq.hu
Sun Feb 20 23:58:57 CET 2005
- Previous message: [MPlayer-cvslog] CVS: main/libvo vo_xv.c, 1.158, 1.159 vo_xvmc.c, 1.14, 1.15 x11_common.h, 1.38, 1.39 x11_common.c, 1.187, 1.188
- Next message: [MPlayer-cvslog] CVS: main ChangeLog,1.173,1.174
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
CVS change done by Alexander Strasser (beastd)
Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv21979/libvo
Modified Files:
x11_common.c
Log Message:
We should not crash, only because we couldn't hide the cursor.
Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- x11_common.c 20 Feb 2005 22:43:25 -0000 1.188
+++ x11_common.c 20 Feb 2005 22:58:55 -0000 1.189
@@ -176,7 +176,10 @@
return; // do not hide, if we're playing at rootwin
colormap = DefaultColormap(disp, DefaultScreen(disp));
- XAllocNamedColor(disp, colormap, "black", &black, &dummy);
+ if ( !XAllocNamedColor(disp, colormap, "black", &black, &dummy) )
+ {
+ return; // color alloc failed, give up
+ }
bm_no = XCreateBitmapFromData(disp, win, bm_no_data, 8, 8);
no_ptr = XCreatePixmapCursor(disp, bm_no, bm_no, &black, &black, 0, 0);
XDefineCursor(disp, win, no_ptr);
- Previous message: [MPlayer-cvslog] CVS: main/libvo vo_xv.c, 1.158, 1.159 vo_xvmc.c, 1.14, 1.15 x11_common.h, 1.38, 1.39 x11_common.c, 1.187, 1.188
- Next message: [MPlayer-cvslog] CVS: main ChangeLog,1.173,1.174
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the MPlayer-cvslog
mailing list