[MPlayer-cvslog] CVS: main/libvo x11_common.c,1.199,1.200

[Alexander Strasser]

Paolo Tresoldi (PaulTT) wrote:
> CVS change done by Paolo Tresoldi (PaulTT)
> 
> Update of /cvsroot/mplayer/main/libvo
> In directory mail:/var2/tmp/cvs-serv4309/libvo
> 
> Modified Files:
> 	x11_common.c 
> Log Message:
> resolves problem in module stop_xscreensaver, crashing mp after sleep and awake or enabling/disabling xssaver by hand

  As I am listed explicitly as the maintainer of this code.
You should have waited for a comment from me!

  I don't like the change (cause i didn't review it yet) and
i think it is even controversoial.

> Index: x11_common.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
> retrieving revision 1.199
> retrieving revision 1.200
> diff -u -r1.199 -r1.200
> --- x11_common.c	10 Nov 2005 02:39:31 -0000	1.199
> +++ x11_common.c	21 Nov 2005 23:51:27 -0000	1.200
> @@ -1572,6 +1572,8 @@
>      unsigned int time = GetTimerMS();
>      XEvent ev;
>  
> +    if (mDisplay)
> +        xs_windowid = find_xscreensaver_window(mDisplay);

  This makes the screensaver functions inconsistent if you
have a look at xscreensaver_enable(). And even if this might
not be triggered to bite atm i advise you to just put...

>      if (mDisplay && xs_windowid &&
>          ((time - time_last) > 30000 || (time - time_last) < 0))
>      {


    xs_windowid = find_xscreensaver_window(mDisplay);
    if ( !xs_windowid ) return;

  ... in the above quoted conditional.
  Please test if this fixes your problem too (i don't see why it
shouldn't) and correct it if it does.

  Also note that i just accidently saw this commit in the middle
of the night and will now go on continue sleeping.

  Alex (beastd)