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

[editor] Insert/load edited and created features only after successful initialization.

Browse source
This commit is contained in:
Alex Zolotarev 2016-03-07 14:39:49 +02:00 • committed by Sergey Yershov
parent 85d6bd2c08
commit 0f1acded75
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
indexer/osm_editor.cpp
View file

@ -189,8 +189,7 @@ void Editor::LoadMapEdits()
if (needMigrateEdits && IsObsolete(xml, fid))
continue;
FeatureTypeInfo & fti = m_features[fid.m_mwmId][fid.m_index];
FeatureTypeInfo fti;
if (section.first == FeatureStatus::Created)
{
fti.m_feature.FromXML(xml);
@ -217,6 +216,8 @@ void Editor::LoadMapEdits()
case FeatureStatus::Created: ++created; break;
case FeatureStatus::Untouched: ASSERT(false, ()); break;
}
// Insert initialized structure at the end: exceptions are possible in above code.
m_features[fid.m_mwmId].emplace(fid.m_index, move(fti));
}
catch (editor::XMLFeatureError const & ex)
{