Kaydet (Commit) 498c3148 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Hack to for now work around dpy == null crashing CppunitTest_chart2_*

...since 2fc4f5cd "Register OpenGL windows to
ScGridWindow upon file load."  Should be revisited and fixed properly.

Change-Id: I5a3d08cb750fd9ec7c98d5b85250eaabd1c7a8b2
üst f3a46244
...@@ -390,7 +390,7 @@ bool OpenGLContext::ImplInit() ...@@ -390,7 +390,7 @@ bool OpenGLContext::ImplInit()
#elif defined( ANDROID ) #elif defined( ANDROID )
#elif defined( UNX ) #elif defined( UNX )
m_aGLWin.ctx = glXCreateContext(m_aGLWin.dpy, m_aGLWin.ctx = m_aGLWin.dpy == 0 ? 0 : glXCreateContext(m_aGLWin.dpy,
m_aGLWin.vi, m_aGLWin.vi,
0, 0,
GL_TRUE); GL_TRUE);
...@@ -690,7 +690,7 @@ SystemWindowData OpenGLContext::generateWinData(Window* pParent) ...@@ -690,7 +690,7 @@ SystemWindowData OpenGLContext::generateWinData(Window* pParent)
Display *dpy = reinterpret_cast<Display*>(sysData->pDisplay); Display *dpy = reinterpret_cast<Display*>(sysData->pDisplay);
if( !glXQueryExtension( dpy, NULL, NULL ) ) if( dpy == 0 || !glXQueryExtension( dpy, NULL, NULL ) )
return aWinData; return aWinData;
XLIB_Window win = sysData->aWindow; XLIB_Window win = sysData->aWindow;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment