gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #6094 from darina/create-context-fix

Browse source 
Fixed invalid context creation on teardown.
This commit is contained in:
Roman Kuznetsov 2017-05-19 19:26:10 +03:00 • committed by GitHub
commit 2957a3ee32
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
drape_frontend/base_renderer.cpp
View file

@ -125,21 +125,24 @@ void BaseRenderer::CheckRenderingEnabled()
unique_lock<mutex> lock(m_renderingEnablingMutex);
m_renderingEnablingCondition.wait(lock, [this] { return m_wasNotified; });
// here rendering is enabled again
m_wasNotified = false;
m_isEnabled = true;
if (m_wasContextReset)
if (!m_selfThread.GetRoutine()->IsCancelled())
{
m_wasContextReset = false;
DisableMessageFiltering();
OnContextCreate();
}
else
{
context->setRenderingEnabled(true);
}
// here rendering is enabled again
m_isEnabled = true;
if (m_wasContextReset)
{
m_wasContextReset = false;
DisableMessageFiltering();
OnContextCreate();
}
else
{
context->setRenderingEnabled(true);
}
}
// notify initiator-thread about rendering enabling
// m_renderingEnablingCompletionHandler will be setup before awakening of this thread
Notify();