actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix stale g_X11Display pointer causing crashes

Browse Source
This commit is contained in:
Glenn Maynard
2004-01-20 02:13:06 +00:00
parent 2dfe29c249
commit 767dbf81ee
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_OGL.cpp
+13 -14
View File
@@ -354,20 +354,6 @@ RageDisplay_OGL::RageDisplay_OGL( VideoModeParams p, bool bAllowUnacceleratedRen
throw; throw;
} }
#if defined(unix)
{
SDL_SysWMinfo info;
SDL_VERSION(&info.version);
if ( SDL_GetWMInfo(&info) < 0 )
{
LOG->Warn("SDL_GetWMInfo failed: %s", SDL_GetError());
return;
}
g_X11Display = info.info.x11.display;
}
#endif
// Log driver details // Log driver details
LOG->Info("OGL Vendor: %s", glGetString(GL_VENDOR)); LOG->Info("OGL Vendor: %s", glGetString(GL_VENDOR));
LOG->Info("OGL Renderer: %s", glGetString(GL_RENDERER)); LOG->Info("OGL Renderer: %s", glGetString(GL_RENDERER));
@@ -680,6 +666,19 @@ CString RageDisplay_OGL::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut )
TEXTUREMAN->InvalidateTextures(); TEXTUREMAN->InvalidateTextures();
} }
#if defined(unix)
{
SDL_SysWMinfo info;
SDL_VERSION(&info.version);
g_X11Display = NULL;
if ( SDL_GetWMInfo(&info) < 0 )
LOG->Warn("SDL_GetWMInfo failed: %s", SDL_GetError());
else
g_X11Display = info.info.x11.display;
}
#endif
this->SetDefaultRenderStates(); this->SetDefaultRenderStates();
DumpOpenGLDebugInfo(); DumpOpenGLDebugInfo();