[MPlayer-cvslog] r34548 - trunk/gui/wm/ws.c

[ib]

Author: ib
Date: Thu Jan 12 16:50:53 2012
New Revision: 34548

Log:
Always inform / warn about missing shared memory / shape extension

Don't do so only after querying the extension.

Modified:
   trunk/gui/wm/ws.c

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Thu Jan 12 16:16:24 2012	(r34547)
+++ trunk/gui/wm/ws.c	Thu Jan 12 16:50:53 2012	(r34548)
@@ -267,14 +267,15 @@ void wsXInit(Display *mDisplay)
     }
 
     if (!XShmQueryExtension(wsDisplay)) {
-        mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_WS_NoXshm);
         wsUseXShm = 0;
     }
 
+    if (!wsUseXShm)
+        mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_WS_NoXshm);
+
 #ifdef CONFIG_XSHAPE
 
     if (!XShapeQueryExtension(wsDisplay, &eventbase, &errorbase)) {
-        mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_WS_NoXshape);
         wsUseXShape = 0;
     }
 
@@ -282,6 +283,9 @@ void wsXInit(Display *mDisplay)
     wsUseXShape = 0;
 #endif
 
+    if (!wsUseXShape)
+        mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_WS_NoXshape);
+
     XSynchronize(wsDisplay, True);
 
     wsScreen  = DefaultScreen(wsDisplay);