summaryrefslogtreecommitdiffstats
path: root/libvo/vo_xvidix.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_xvidix.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_xvidix.c')
-rw-r--r--libvo/vo_xvidix.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c
index 38194e68d0..3dd405b7a9 100644
--- a/libvo/vo_xvidix.c
+++ b/libvo/vo_xvidix.c
@@ -380,9 +380,6 @@ else
XSync(mDisplay, False);
}
-#ifdef HAVE_NEW_GUI
- if (vo_window == None)
-#endif
saver_off(mDisplay); /* turning off screen saver */
return(0);
@@ -468,12 +465,12 @@ static uint32_t query_format(uint32_t format)
static void uninit(void)
{
vidix_term();
+ saver_on(mDisplay); /* screen saver back on */
#ifdef HAVE_NEW_GUI
/* destroy window only if it's not controlled by GUI */
if (vo_window == None)
#endif
{
- saver_on(mDisplay); /* screen saver back on */
if (!(WinID > 0)) /* don't destory window if -wid specified */
{
XDestroyWindow(mDisplay, mWindow);