summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-04-24 00:41:12 +0200
committerwm4 <wm4@mplayer2.org>2012-04-24 01:25:10 +0200
commit70fe8d12fa6c4892274655672204b1d748727092 (patch)
tree1031183b8a55554843fd79af26015e1f0af613bd
parentbe10a06c84e566a819c1c3dd55a60dc835752480 (diff)
downloadmpv-70fe8d12fa6c4892274655672204b1d748727092.tar.bz2
mpv-70fe8d12fa6c4892274655672204b1d748727092.tar.xz
win32: don't crash if vo_w32_uninit() is called without vo_w32_init()
This is a recent regression. At least vo_direct3d uses vo_w32_uninit() in this way, and crashed if initialization failed at an early point.
-rw-r--r--libvo/w32_common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libvo/w32_common.c b/libvo/w32_common.c
index ad8d1f453b..ebe17bd154 100644
--- a/libvo/w32_common.c
+++ b/libvo/w32_common.c
@@ -742,6 +742,8 @@ void vo_w32_uninit(struct vo *vo)
{
struct vo_w32_state *w32 = vo->w32;
mp_msg(MSGT_VO, MSGL_V, "vo: win32: uninit\n");
+ if (!w32)
+ return;
resetMode(vo);
ShowCursor(1);
if (w32->dev_hdc) DeleteDC(w32->dev_hdc);