From a7637604b461868d44c560579855eb60f0d3c65b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
Date: Tue, 11 Jan 2022 00:08:51 +0100
Subject: [PATCH] Properly handle metric temperature w/o wifi

---
 src/Watchy.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Watchy.cpp b/src/Watchy.cpp
index 566e2f7..b0b696d 100644
--- a/src/Watchy.cpp
+++ b/src/Watchy.cpp
@@ -571,6 +571,7 @@ weatherData Watchy::getWeatherData(){
 }
 
 weatherData Watchy::getWeatherData(String cityID, String units, String lang, String url, String apiKey, uint8_t updateInterval){
+    currentWeather.isMetric = settings.weatherUnit == String("metric");
     if(weatherIntervalCounter < 0){ //-1 on first run, set to updateInterval
         weatherIntervalCounter = updateInterval;
     }
@@ -585,7 +586,6 @@ weatherData Watchy::getWeatherData(String cityID, String units, String lang, Str
                 String payload = http.getString();
                 JSONVar responseObject = JSON.parse(payload);
                 currentWeather.temperature = int(responseObject["main"]["temp"]);
-                currentWeather.isMetric = settings.weatherUnit == String("metric");
                 currentWeather.weatherConditionCode = int(responseObject["weather"][0]["id"]);
                 currentWeather.weatherDescription = responseObject["weather"][0]["main"];
             }else{
@@ -597,7 +597,7 @@ weatherData Watchy::getWeatherData(String cityID, String units, String lang, Str
             btStop();
         }else{//No WiFi, use internal temperature sensor
             uint8_t temperature = sensor.readTemperature(); //celsius
-            if(units != String("metric")){
+            if(!currentWeather.isMetric){
                 temperature = temperature * 9. / 5. + 32.; //fahrenheit
             }
             currentWeather.temperature = temperature;