diff options
| author | ksorim <ksorim@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-23 10:09:39 +0000 |
|---|---|---|
| committer | ksorim <ksorim@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-23 10:09:39 +0000 |
| commit | 8a9f8447ef6c57b6dbf9133871be7db684fb99ba (patch) | |
| tree | 79636a83a557ab500b402aad2281433ab9d439a3 /libvo/vo_sdl.c | |
| parent | b2eb613e282b94c5a71a392e120ca5c2a406bee4 (diff) | |
| download | mpv-8a9f8447ef6c57b6dbf9133871be7db684fb99ba.tar.bz2 mpv-8a9f8447ef6c57b6dbf9133871be7db684fb99ba.tar.xz | |
Fixes crash which occured when it wasn't possible to connect to the display
name in DISPLAY.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5268 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_sdl.c')
| -rw-r--r-- | libvo/vo_sdl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index 94970fd659..2b06c992cb 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -822,9 +822,9 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin priv->format = format; #ifdef HAVE_X11 - if(getenv("DISPLAY")) { + XDisplay = XOpenDisplay(NULL); + if(XDisplay) { if(verbose) printf("SDL: deactivating XScreensaver/DPMS\n"); - XDisplay = XOpenDisplay(getenv("DISPLAY")); XScreen = DefaultScreen(XDisplay); priv->XWidth = DisplayWidth(XDisplay, XScreen); priv->XHeight = DisplayHeight(XDisplay, XScreen); @@ -1607,9 +1607,10 @@ uninit(void) { #ifdef HAVE_X11 static Display *XDisplay; - if(getenv("DISPLAY")) { + XDisplay = XOpenDisplay(NULL); + if(XDisplay) { if(verbose) printf("SDL: activating XScreensaver/DPMS\n"); - XDisplay = XOpenDisplay(getenv("DISPLAY")); + saver_on(XDisplay); XCloseDisplay(XDisplay); } |