There is an unneeded null check in the dtor.
From: Erik Hovland <erik@hovland.org>
---
libs/libmythtv/openglcontext.cpp | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/libs/libmythtv/openglcontext.cpp b/libs/libmythtv/openglcontext.cpp
index 5e7dc18..e900e24 100644
a
|
b
|
OpenGLContext::~OpenGLContext() |
62 | 62 | |
63 | 63 | MakeCurrent(false); |
64 | 64 | |
65 | | if (m_priv) |
| 65 | if (m_priv->m_glx_window) |
66 | 66 | { |
67 | | if (m_priv->m_glx_window) |
68 | | { |
69 | | X11S(glXDestroyWindow(m_display, m_priv->m_glx_window)); |
70 | | m_priv->m_glx_window = 0; |
71 | | } |
72 | | |
73 | | if (m_priv->m_gl_window) |
74 | | { |
75 | | X11S(XDestroyWindow(m_display, m_priv->m_gl_window)); |
76 | | m_priv->m_gl_window = 0; |
77 | | } |
| 67 | X11S(glXDestroyWindow(m_display, m_priv->m_glx_window)); |
| 68 | m_priv->m_glx_window = 0; |
| 69 | } |
78 | 70 | |
79 | | if (m_priv->m_glx_context) |
80 | | { |
81 | | X11S(glXDestroyContext(m_display, m_priv->m_glx_context)); |
82 | | m_priv->m_glx_context = 0; |
83 | | } |
| 71 | if (m_priv->m_gl_window) |
| 72 | { |
| 73 | X11S(XDestroyWindow(m_display, m_priv->m_gl_window)); |
| 74 | m_priv->m_gl_window = 0; |
| 75 | } |
84 | 76 | |
85 | | delete m_priv; |
86 | | m_priv = NULL; |
| 77 | if (m_priv->m_glx_context) |
| 78 | { |
| 79 | X11S(glXDestroyContext(m_display, m_priv->m_glx_context)); |
| 80 | m_priv->m_glx_context = 0; |
87 | 81 | } |
| 82 | |
| 83 | delete m_priv; |
88 | 84 | } |
89 | 85 | |
90 | 86 | void OpenGLContext::Hide(void) |