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

[iOS] Fix some potential bug in WindowHandle <-> IOSVideoTimer routine.

Browse source
This commit is contained in:
vng 2012-07-12 15:14:48 -07:00 • committed by Alex Zolotarev
parent 01857d535e
commit 132f07f8be
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
platform/ios_video_timer.mm
View file

@ -48,10 +48,12 @@ public:
{
if (m_displayLink)
{
// Set EStopped flag first. It seems like 'CADisplayLink::invalidate' can invoke pending 'perform'.
// So we should check EStopped flag in 'perform' to skip pending call.
m_state = EStopped;
[m_displayLink invalidate];
[m_objCppWrapper release];
m_displayLink = 0;
m_state = EStopped;
}
}
@ -69,7 +71,10 @@ public:
void perform()
{
m_frameFn();
// In case when we stopped and have pending perform at the same time.
// It's not allowed to call m_frameFn after stopping (see WindowHandle::~WindowHandle).
if (m_state != EStopped)
m_frameFn();
}
};