diff options
author | vng <viktor.govako@gmail.com> | 2012-06-13 12:10:06 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:39:45 +0300 |
commit | 6db85bfa17869e85d34553e59f1ccedb0bc4b5e6 (patch) | |
tree | 57a5d999d0d57db7d50f4035e423b2c8463ef220 /map/country_status_display.cpp | |
parent | c5d7af70297051b4c57a2c5f00d0f3b5188fdfe3 (diff) |
Fix bug with downloaded country name in startup view.
Diffstat (limited to 'map/country_status_display.cpp')
-rw-r--r-- | map/country_status_display.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/map/country_status_display.cpp b/map/country_status_display.cpp index e7c4161ab5..85e851bc01 100644 --- a/map/country_status_display.cpp +++ b/map/country_status_display.cpp @@ -2,14 +2,13 @@ #include "../gui/controller.hpp" -#include "../std/bind.hpp" -#include "../std/sstream.hpp" +#include "../yg/overlay_renderer.hpp" #include "../base/string_format.hpp" -#include "../storage/storage.hpp" +#include "../std/bind.hpp" +#include "../std/sstream.hpp" -#include "../yg/overlay_renderer.hpp" string const CountryStatusDisplay::displayName() const { @@ -181,18 +180,7 @@ void CountryStatusDisplay::setCountryName(string const & name) { if (m_fullName != name) { - size_t pos = name.find(","); - if (pos == string::npos) - { - m_mapName = name; - m_mapGroupName.clear(); - } - else - { - m_mapName = name.substr(pos + 2); - m_mapGroupName = name.substr(0, pos); - } - + storage::CountryInfo::FullName2GroupAndMap(name, m_mapGroupName, m_mapName); LOG(LINFO, (m_mapName, m_mapGroupName)); m_countryIdx = m_storage->FindIndexByName(m_mapName); |