[core] cherry-pick from upstream/routing fixes

This commit is contained in:
ExMix 2014-10-01 14:37:42 +03:00 committed by Alex Zolotarev
parent 2c12766f69
commit 21c3e4c92c
2 changed files with 1 additions and 1 deletions

View file

@ -127,7 +127,6 @@ void CompassArrow::CreateAnim(double startAlfa, double endAlfa, double timeInter
m_animTask->Cancel();
m_animTask.reset(new AlfaAnimationTask(startAlfa, endAlfa, timeInterval, timeOffset, m_framework));
LOG(LINFO, ("Create compas alfa anim = ", m_animTask.get()));
m_animTask->AddCallback(anim::Task::EEnded, bind(&CompassArrow::AlfaAnimEnded, this, isVisibleAtEnd));
m_framework->GetAnimController()->AddTask(m_animTask);
}

View file

@ -407,6 +407,7 @@ void State::StopCompassFollowing()
void State::StopLocationFollow()
{
StopCompassFollowing();
if (GetMode() > NotFollow)
SetModeInfo(ChangeMode(m_modeInfo, NotFollow));
}