From 19f9a7066ea3c5ca9c185e902465bd40bda4883c Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Wed, 3 Dec 2014 22:37:39 +0100
Subject: vo_opengl: make uninit idempotent

---
 video/out/gl_video.c  | 3 +++
 video/out/vo_opengl.c | 9 +++------
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'video')

diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index d2d0c2e571..07ba0bd602 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -2197,6 +2197,9 @@ static int init_gl(struct gl_video *p)
 
 void gl_video_uninit(struct gl_video *p)
 {
+    if (!p)
+        return;
+
     GL *gl = p->gl;
 
     uninit_video(p);
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 7993b0a3e7..2043a4cd3c 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -392,12 +392,9 @@ static void uninit(struct vo *vo)
 {
     struct gl_priv *p = vo->priv;
 
-    if (p->glctx) {
-        if (p->renderer)
-            gl_video_uninit(p->renderer);
-        gl_hwdec_uninit(p->hwdec);
-        mpgl_uninit(p->glctx);
-    }
+    gl_video_uninit(p->renderer);
+    gl_hwdec_uninit(p->hwdec);
+    mpgl_uninit(p->glctx);
 }
 
 static int preinit(struct vo *vo)
-- 
cgit v1.2.3