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:
authorVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2015-09-11 16:51:40 +0300
committerAlex Zolotarev <alex@maps.me>2015-09-23 03:04:24 +0300
commitc67c4678890ab51433f3e831c9989bf0527abcca (patch)
treef434bf44a0ee9fd19d8dc40acc969d1e683eee75 /indexer/map_style_reader.cpp
parenta5213af59250aa90fe3533c34b92fda6fee2418e (diff)
Hot tests fix.
Diffstat (limited to 'indexer/map_style_reader.cpp')
-rw-r--r--indexer/map_style_reader.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/indexer/map_style_reader.cpp b/indexer/map_style_reader.cpp
index feab3d0946..db88c4b6be 100644
--- a/indexer/map_style_reader.cpp
+++ b/indexer/map_style_reader.cpp
@@ -42,9 +42,14 @@ void StyleReader::SetCurrentStyle(MapStyle mapStyle)
MapStyle StyleReader::GetCurrentStyle()
{
- int mapStyle;
+ int mapStyle = MapStyleLight;
+// @TODO(shalnev) It's a hotfix to fix tests generator_tests and map_tests.
+// Tests should work with any styles.
+#if defined(OMIM_OS_ANDROID) || defined(OMIM_OS_IPHONE)
if (!Settings::Get(kMapStyleKey, mapStyle))
mapStyle = MapStyleClear;
+#endif
+
return static_cast<MapStyle>(mapStyle);
}