kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Fixed deadlock on entering background/foreground

Browse source
This commit is contained in:
r.kuznetsov 2016-03-09 15:58:44 +03:00 • committed by Sergey Yershov
parent 838578602c
commit d95070104d
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drape_frontend/base_renderer.cpp
View file

@ -59,6 +59,11 @@ void BaseRenderer::SetRenderingEnabled(bool const isEnabled)
completionCondition.wait(lock, [&notified] { return notified; });
}
bool BaseRenderer::IsRenderingEnabled() const
{
return m_isEnabled;
}
void BaseRenderer::SetRenderingEnabled(bool const isEnabled, TCompletionHandler completionHandler)
{
if (isEnabled == m_isEnabled)

1
drape_frontend/base_renderer.hpp
View file

@ -41,6 +41,7 @@ public:
bool CanReceiveMessages();
void SetRenderingEnabled(bool const isEnabled);
bool IsRenderingEnabled() const;
protected:
ref_ptr<ThreadsCommutator> m_commutator;

4
drape_frontend/frontend_renderer.cpp
View file

@ -1420,7 +1420,9 @@ void FrontendRenderer::Routine::Do()
if (activityTimer.ElapsedSeconds() > kMaxInactiveSeconds)
{
// Process a message or wait for a message.
m_renderer.ProcessSingleMessage();
// IsRenderingEnabled() can return false in case of rendering disabling and we must prevent
// possibility of infinity waiting in ProcessSingleMessage.
m_renderer.ProcessSingleMessage(m_renderer.IsRenderingEnabled());
activityTimer.Reset();
}
else