RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Code Issues Releases Wiki Activity

x11_common: always free x11 context struct on exit

Browse Source 
Previously it was not freed if no X11 display had been opened (for
example -vo null).
This commit is contained in:
Uoti Urpala 2010-01-28 01:12:34 +02:00
parent c710c5ee50
commit 42244dd2a4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libvo/x11_common.c
View File

@ -520,14 +520,13 @@ void vo_uninit(struct vo_x11_state *x11)
{ {
mp_msg(MSGT_VO, MSGL_V, mp_msg(MSGT_VO, MSGL_V,
"vo: x11 uninit called but X11 not initialized..\n"); "vo: x11 uninit called but X11 not initialized..\n");
return; } else {
mp_msg(MSGT_VO, MSGL_V, "vo: uninit ...\n");
XSetErrorHandler(NULL);
XCloseDisplay(x11->display);
x11->depthonscreen = 0;
x11->display = NULL;
} }
// if( !vo_depthonscreen ) return;
mp_msg(MSGT_VO, MSGL_V, "vo: uninit ...\n");
XSetErrorHandler(NULL);
XCloseDisplay(x11->display);
x11->depthonscreen = 0;
x11->display = NULL;
talloc_free(x11); talloc_free(x11);
} }