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

Block bookmarks file loading while applying bookmarks restore.

Browse source
This commit is contained in:
Daria Volvenkova 2018-04-10 20:00:19 +03:00 • committed by Roman Kuznetsov
parent 0624421934
commit 51999dc7da
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
map/bookmark_manager.cpp
View file

@ -865,6 +865,8 @@ void BookmarkManager::LoadBookmarks()
void BookmarkManager::LoadBookmark(std::string const & filePath, bool isTemporaryFile)
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
if (m_restoreApplying)
return;
if (!m_loadBookmarksFinished || m_asyncLoadingInProgress)
{
m_bookmarkLoadingQueue.emplace_back(filePath, isTemporaryFile);
@ -1654,6 +1656,9 @@ void BookmarkManager::OnSynchronizationStarted(Cloud::SynchronizationType type)
{
GetPlatform().RunTask(Platform::Thread::Gui, [this, type]()
{
if (type == Cloud::SynchronizationType::Restore)
m_restoreApplying = true;
if (m_onSynchronizationStarted)
m_onSynchronizationStarted(type);
});
@ -1670,11 +1675,12 @@ void BookmarkManager::OnSynchronizationFinished(Cloud::SynchronizationType type,
if (m_onSynchronizationFinished)
m_onSynchronizationFinished(type, result, errorStr);
if (type == Cloud::SynchronizationType::Restore &&
result == Cloud::SynchronizationResult::Success)
if (type == Cloud::SynchronizationType::Restore)
{
m_restoreApplying = false;
// Reload bookmarks after restoring.
LoadBookmarks();
if (result == Cloud::SynchronizationResult::Success)
LoadBookmarks();
}
});

1
map/bookmark_manager.hpp
View file

@ -447,6 +447,7 @@ private:
size_t m_openedEditSessionsCount = 0;
bool m_loadBookmarksFinished = false;
bool m_firstDrapeNotification = false;
bool m_restoreApplying = false;
ScreenBase m_viewport;