From 04c5b4d6070c72c693cb6f8d79e95c52c5faa7cd Mon Sep 17 00:00:00 2001 From: furrtek Date: Sat, 14 Oct 2017 11:33:41 +0100 Subject: [PATCH] Stupid mistake with world_map.bin detection --- firmware/application/ui_geomap.cpp | 10 +++++----- firmware/application/ui_geomap.hpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware/application/ui_geomap.cpp b/firmware/application/ui_geomap.cpp index 807b360e5..a81527c2e 100644 --- a/firmware/application/ui_geomap.cpp +++ b/firmware/application/ui_geomap.cpp @@ -211,7 +211,7 @@ void GeoMap::draw_bearing(const Point origin, const uint32_t angle, uint32_t siz void GeoMapView::focus() { geopos.focus(); - if (!file_error) + if (!map_opened) nav_.display_modal("No map", "No world_map.bin file in\n/ADSB/ directory", ABORT, nullptr); } @@ -280,8 +280,8 @@ GeoMapView::GeoMapView( add_child(&geopos); - file_error = !geomap.init(); - if (file_error) return; + map_opened = geomap.init(); + if (!map_opened) return; setup(); @@ -308,8 +308,8 @@ GeoMapView::GeoMapView( add_child(&geopos); - file_error = !geomap.init(); - if (file_error) return; + map_opened = geomap.init(); + if (!map_opened) return; setup(); add_child(&button_ok); diff --git a/firmware/application/ui_geomap.hpp b/firmware/application/ui_geomap.hpp index 8a575fa3e..4608742cd 100644 --- a/firmware/application/ui_geomap.hpp +++ b/firmware/application/ui_geomap.hpp @@ -172,7 +172,7 @@ private: float angle_ { }; std::function on_close_ { nullptr }; - bool file_error { }; + bool map_opened { }; GeoPos geopos { { 0, 0 }