mirror of https://github.com/mpv-player/mpv
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
This commit is contained in:
parent
b2eb613e28
commit
8a9f8447ef
|
@ -822,9 +822,9 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
|
||||||
priv->format = format;
|
priv->format = format;
|
||||||
|
|
||||||
#ifdef HAVE_X11
|
#ifdef HAVE_X11
|
||||||
if(getenv("DISPLAY")) {
|
XDisplay = XOpenDisplay(NULL);
|
||||||
|
if(XDisplay) {
|
||||||
if(verbose) printf("SDL: deactivating XScreensaver/DPMS\n");
|
if(verbose) printf("SDL: deactivating XScreensaver/DPMS\n");
|
||||||
XDisplay = XOpenDisplay(getenv("DISPLAY"));
|
|
||||||
XScreen = DefaultScreen(XDisplay);
|
XScreen = DefaultScreen(XDisplay);
|
||||||
priv->XWidth = DisplayWidth(XDisplay, XScreen);
|
priv->XWidth = DisplayWidth(XDisplay, XScreen);
|
||||||
priv->XHeight = DisplayHeight(XDisplay, XScreen);
|
priv->XHeight = DisplayHeight(XDisplay, XScreen);
|
||||||
|
@ -1607,9 +1607,10 @@ uninit(void)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_X11
|
#ifdef HAVE_X11
|
||||||
static Display *XDisplay;
|
static Display *XDisplay;
|
||||||
if(getenv("DISPLAY")) {
|
XDisplay = XOpenDisplay(NULL);
|
||||||
|
if(XDisplay) {
|
||||||
if(verbose) printf("SDL: activating XScreensaver/DPMS\n");
|
if(verbose) printf("SDL: activating XScreensaver/DPMS\n");
|
||||||
XDisplay = XOpenDisplay(getenv("DISPLAY"));
|
|
||||||
saver_on(XDisplay);
|
saver_on(XDisplay);
|
||||||
XCloseDisplay(XDisplay);
|
XCloseDisplay(XDisplay);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue