Mercurial > mplayer.hg

changeset 34460:c4731df07bfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Always inform / warn about missing shared memory / shape extension Don't do so only after querying the extension.
author ib
date Thu, 12 Jan 2012 15:50:53 +0000
parents a45b07efa3b8
children e3d6a010e8ae
files gui/wm/ws.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gui/wm/ws.c	Thu Jan 12 15:16:24 2012 +0000
+++ b/gui/wm/ws.c	Thu Jan 12 15:50:53 2012 +0000
@@ -267,14 +267,15 @@
     }
 
     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 @@
     wsUseXShape = 0;
 #endif
 
+    if (!wsUseXShape)
+        mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_WS_NoXshape);
+
     XSynchronize(wsDisplay, True);
 
     wsScreen  = DefaultScreen(wsDisplay);