From 4bb7ecec9eb21d3a90e91d75c78acf576f75c399 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Mon, 21 Nov 2022 19:26:38 +0100 Subject: [PATCH] fix segfault from 352fcdf54d201528fe722ab7da3d7926bcc601f5 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/43a61920ac48b54ed52b07ea26e6cca475cfad0f Author: TangoCash Date: 2022-11-21 (Mon, 21 Nov 2022) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/glcd/glcd.cpp | 3 ++- src/driver/glcd/weather.cpp | 5 ----- src/driver/glcd/weather.h | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/driver/glcd/glcd.cpp b/src/driver/glcd/glcd.cpp index 8e9e94ded..469af0ba8 100644 --- a/src/driver/glcd/glcd.cpp +++ b/src/driver/glcd/glcd.cpp @@ -137,7 +137,6 @@ cGLCD::cGLCD() InitAnalogClock(); InitDigitalClock(); InitSimpleClock(); - InitWeather(); Update(); } @@ -667,6 +666,8 @@ void cGLCD::updateFonts() } } + WeatherUpdateFonts(); + fonts_initialized = true; } diff --git a/src/driver/glcd/weather.cpp b/src/driver/glcd/weather.cpp index f5b9bd3f5..16792e49a 100644 --- a/src/driver/glcd/weather.cpp +++ b/src/driver/glcd/weather.cpp @@ -51,11 +51,6 @@ int weather_fontsize; int standby_weather_percent; int standby_weather_fontsize; -void InitWeather() -{ - WeatherUpdateFonts(); -} - void WeatherUpdateFonts() { cGLCD *cglcd = cGLCD::getInstance(); diff --git a/src/driver/glcd/weather.h b/src/driver/glcd/weather.h index 3839321c5..94e26bf6f 100644 --- a/src/driver/glcd/weather.h +++ b/src/driver/glcd/weather.h @@ -28,7 +28,6 @@ #pragma GCC diagnostic warning "-Wunused-parameter" #include "glcd.h" -void InitWeather(); void WeatherUpdateFonts(); void RenderWeather(int cx, int cy, int nx, int ny, bool standby); void ShowWeather(bool standby);