diff options
| author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2017-05-15 16:07:08 +0300 |
|---|---|---|
| committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2017-05-15 16:07:08 +0300 |
| commit | dfb8579bbef1685ba51cbce6d492dcd79696f9cb (patch) | |
| tree | 2ab522c0653ca99d5f7b20cea8d598d68ed5f306 /drape_frontend | |
| parent | 0692ac9253f62c55692fd4767050fceb4e4f6095 (diff) | |
Fixed style switch in stylist
Diffstat (limited to 'drape_frontend')
| -rw-r--r-- | drape_frontend/stylist.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drape_frontend/stylist.cpp b/drape_frontend/stylist.cpp index c1aa1fe69b..39d45dcc91 100644 --- a/drape_frontend/stylist.cpp +++ b/drape_frontend/stylist.cpp @@ -73,7 +73,8 @@ void FilterRulesByRuntimeSelector(FeatureType const & f, int zoomLevel, drule::K keys.erase_if([&f, zoomLevel](drule::Key const & key)->bool { drule::BaseRule const * const rule = drule::rules().Find(key); - ASSERT(rule != nullptr, ()); + if (rule == nullptr) + return true; return !rule->TestFeature(f, zoomLevel); }); } @@ -143,6 +144,9 @@ private: } drule::BaseRule const * const dRule = drule::rules().Find(key); + if (dRule == nullptr) + return; + m_rules.emplace_back(make_pair(dRule, depth)); if (dRule->GetCaption(0) != nullptr) |