summaryrefslogtreecommitdiffstats
path: root/libvo/vo_xv.c
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-23 15:16:20 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-23 15:16:20 +0000
commitdc4ee0b259625af9e5949f2d18f9ad49d2389a15 (patch)
tree77d4b641a9c7d38f42054786bc3c072408e93fee /libvo/vo_xv.c
parent53ddbc7ccc8179caf16a220e63dd13a98e16a5ba (diff)
downloadmpv-dc4ee0b259625af9e5949f2d18f9ad49d2389a15.tar.bz2
mpv-dc4ee0b259625af9e5949f2d18f9ad49d2389a15.tar.xz
fix screen saver bug under gui
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4317 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_xv.c')
-rw-r--r--libvo/vo_xv.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 5357f5f2f8..31b2669240 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -377,10 +377,7 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t
drwHeight=(dheight > vo_screenheight?vo_screenheight:dheight);
printf( "[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );
}
-#ifdef HAVE_NEW_GUI
- if ( vo_window == None )
-#endif
- saver_off(mDisplay); // turning off screen saver
+ saver_off(mDisplay); // turning off screen saver
return 0;
}
}
@@ -585,11 +582,11 @@ static uint32_t query_format(uint32_t format)
static void uninit(void)
{
int i;
+ saver_on(mDisplay); // screen saver back on
#ifdef HAVE_NEW_GUI
if ( vo_window == None )
#endif
{
- saver_on(mDisplay); // screen saver back on
XDestroyWindow( mDisplay,mywindow );
}
for( i=0;i<num_buffers;i++ ) deallocate_xvimage( i );