diff options
| author | jkeil <jkeil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-19 19:47:16 +0000 |
|---|---|---|
| committer | jkeil <jkeil@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-19 19:47:16 +0000 |
| commit | f636151e5f0e92e106cc026d01974511e6eb05a3 (patch) | |
| tree | 9ede86aa489de7985ac9d2493e510c757ed393a7 /Gui | |
| parent | 0ba571253cbc4354bbc0b43b1f7b21f075a6d49c (diff) | |
| download | mpv-f636151e5f0e92e106cc026d01974511e6eb05a3.tar.bz2 mpv-f636151e5f0e92e106cc026d01974511e6eb05a3.tar.xz | |
- wsErrorHandler was crashing on solaris with a null pointer access in printf;
don't crash when current_module is not set.
- CWX, CWY, CWWidth, CWHeight are invalid attributes for CreateWindow, they
should be used with ConfigureWindow only. (Note: their definition is
equivalent to CWBackPixmap, CWBackPixel, CWBorderPixmap, CWBorderPixel)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7802 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/wm/ws.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c index 443bc8b958..a9a1e44d8d 100644 --- a/Gui/wm/ws.c +++ b/Gui/wm/ws.c @@ -161,7 +161,7 @@ int wsErrorHandler( Display * dpy,XErrorEvent * Event ) fprintf(stderr,"[ws] Error code: %d ( %s )\n",Event->error_code,type ); fprintf(stderr,"[ws] Request code: %d\n",Event->request_code ); fprintf(stderr,"[ws] Minor code: %d\n",Event->minor_code ); - fprintf(stderr,"[ws] Modules: %s\n",current_module ); + fprintf(stderr,"[ws] Modules: %s\n",current_module?current_module:"(NULL)" ); exit( 0 ); } @@ -436,7 +436,6 @@ void wsCreateWindow( wsTWindow * win,int X,int Y,int wX,int hY,int bW,int cV,uns win->WindowMask=CWBackPixel | CWBorderPixel | CWColormap | CWEventMask | CWCursor | - CWX | CWY | CWWidth | CWHeight | CWOverrideRedirect; win->WindowID=XCreateWindow( wsDisplay, |