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

Merge pull request #4243 from milchakov/disable_online_config

Browse source 
disable online config
This commit is contained in:
ygorshenin 2016-09-09 13:07:10 +03:00 • committed by GitHub
commit adb50ae098
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/config_loader.cpp
View file

@ -65,13 +65,13 @@ ConfigLoader::ConfigLoader(EditorConfigWrapper & config) : m_config(config)
pugi::xml_document doc;
LoadFromLocal(doc);
ResetConfig(doc);
m_loaderThread = thread(&ConfigLoader::LoadFromServer, this);
//m_loaderThread = thread(&ConfigLoader::LoadFromServer, this);
}
ConfigLoader::~ConfigLoader()
{
m_waiter.Interrupt();
m_loaderThread.join();
//m_loaderThread.join();
}
void ConfigLoader::LoadFromServer()