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

Review fixes

Browse source
This commit is contained in:
r.kuznetsov 2018-07-24 17:16:53 +03:00 • committed by Roman Kuznetsov
parent 0ad97b3ae7
commit 3d5ec1bd76
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/jni/com/mapswithme/opengl/androidoglcontextfactory.cpp
View file

@ -183,6 +183,14 @@ void AndroidOGLContextFactory::SetSurface(JNIEnv * env, jobject jsurface)
void AndroidOGLContextFactory::ResetSurface()
{
{
std::unique_lock<std::mutex> lock(m_initializationMutex);
if (m_initializationCounter > 0 && m_initializationCounter < kGLThreadsCount)
m_initializationCondition.wait(lock, [this] { return m_isInitialized; });
m_initializationCounter = 0;
m_isInitialized = false;
}
if (m_drawContext != nullptr)
m_drawContext->resetSurface();
@ -197,10 +205,6 @@ void AndroidOGLContextFactory::ResetSurface()
m_windowSurfaceValid = false;
}
std::lock_guard<std::mutex> lock(m_initializationMutex);
m_initializationCounter = 0;
m_isInitialized = false;
}
bool AndroidOGLContextFactory::IsValid() const