diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-04-02 03:31:38 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-04-08 04:38:20 +0200 |
| commit | b458c16a431010712b0d5e18b125a9ec897372c9 (patch) | |
| tree | df3740fbb1a74da836df48a4f8bff0e6c1202fe4 /include | |
| parent | prevent initializing the OpenGL context multiple times (diff) | |
| download | core-b458c16a431010712b0d5e18b125a9ec897372c9.tar.gz core-b458c16a431010712b0d5e18b125a9ec897372c9.zip | |
fix crash when passing external Window to OpenGLContext::init
The external window is not controlled by OpenGLContext so it is not
allowed to delete the window
Change-Id: Id2c79a3612cc875fd94b8cd1206b30af2f185875
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/OpenGLContext.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/vcl/OpenGLContext.hxx b/include/vcl/OpenGLContext.hxx index 91355bfe6981..e84e8fc64a04 100644 --- a/include/vcl/OpenGLContext.hxx +++ b/include/vcl/OpenGLContext.hxx @@ -108,6 +108,7 @@ private: GLWindow m_aGLWin; boost::scoped_ptr<Window> m_pWindow; + Window* mpWindow; //points to m_pWindow or the parent window, don't delete it boost::scoped_ptr<SystemChildWindow> m_pChildWindow; bool mbInitialized; }; |