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

Fixed restore connect to gps when drape is destroyed and then created

Browse source
This commit is contained in:
Constantin Shalnev 2015-12-11 18:54:38 +03:00
parent 8ced79c005
commit b562abdba2
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
map/framework.cpp
View file

@ -1305,7 +1305,6 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
if (m_connectToGpsTrack)
{
m_connectToGpsTrack = false;
GpsTracker::Instance().Connect(bind(&Framework::OnUpdateGpsTrackPointsCallback, this, _1, _2));
}
}
@ -1318,22 +1317,18 @@ ref_ptr<df::DrapeEngine> Framework::GetDrapeEngine()
void Framework::DestroyDrapeEngine()
{
GpsTracker::Instance().Disconnect();
m_drapeEngine.reset();
}
void Framework::ConnectToGpsTracker()
{
m_connectToGpsTrack = true;
if (m_drapeEngine)
{
m_connectToGpsTrack = false;
m_drapeEngine->ClearGpsTrackPoints();
GpsTracker::Instance().Connect(bind(&Framework::OnUpdateGpsTrackPointsCallback, this, _1, _2));
}
else
{
// Postspone connect to tracker until is being constructed
m_connectToGpsTrack = true;
}
}
void Framework::DisconnectFromGpsTracker()