Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix application crash when calling Shader::isAvailable() #608.

Browse Source
This commit is contained in:
Lukas Dürrenberger 2014-05-23 10:43:51 +02:00
parent 2215f55ef9
commit a3ab6efa23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/SFML/Graphics/RenderTarget.cpp
View File

@ -340,6 +340,9 @@ void RenderTarget::popGLStates()
////////////////////////////////////////////////////////////
void RenderTarget::resetGLStates()
{
// Check here to make sure a context change does not happen after activate(true)
bool shaderAvailable = Shader::isAvailable();
if (activate(true))
{
// Make sure that extensions are initialized
@ -362,7 +365,7 @@ void RenderTarget::resetGLStates()
applyBlendMode(BlendAlpha);
applyTransform(Transform::Identity);
applyTexture(NULL);
if (Shader::isAvailable())
if (shaderAvailable)
applyShader(NULL);
m_cache.useVertexCache = false;