Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Zolotarev <alex@maps.me>2016-03-04 17:09:52 +0300
committerSergey Yershov <yershov@corp.mail.ru>2016-03-23 16:51:25 +0300
commitecf000875f9cd6d71cc0fa027589a27e81cd84f1 (patch)
treef5d4df6317ac53cf552ed6eb2dbd8247b3afe646 /indexer/osm_editor.cpp
parent36eb8d547d6a16a54a56e87ef1b2580afd8c7f39 (diff)
[editor] Correctly handle case when type is not defined in properties.
Diffstat (limited to 'indexer/osm_editor.cpp')
-rw-r--r--indexer/osm_editor.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index 03deca1eca..e75bb71c61 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -463,11 +463,11 @@ vector<uint32_t> Editor::GetFeaturesByStatus(MwmSet::MwmId const & mwmId, Featur
EditableProperties Editor::GetEditableProperties(FeatureType const & feature) const
{
-
feature::TypesHolder const types(feature);
- auto const desc = m_config.GetTypeDescription(types.ToObjectNames());
- return {{begin(desc.GetEditableFields()), end(desc.GetEditableFields())},
- desc.IsNameEditable(), desc.IsAddressEditable()};
+ editor::TypeAggregatedDescription desc;
+ if (m_config.GetTypeDescription(types.ToObjectNames(), desc))
+ return {desc.GetEditableFields(), desc.IsNameEditable(), desc.IsAddressEditable()};
+ return {};
}
bool Editor::HaveSomethingToUpload() const