From a88d114591acad2fecb2df8a660763dec3a63db7 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Mon, 21 Nov 2022 19:26:38 +0100 Subject: [PATCH] fix segfault from - glcd: fix warning: statement is a reference, not call --- 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 7b2270dab..e152acb66 100644 --- a/src/driver/glcd/glcd.cpp +++ b/src/driver/glcd/glcd.cpp @@ -137,7 +137,6 @@ cGLCD::cGLCD() InitAnalogClock(); InitDigitalClock(); InitSimpleClock(); - InitWeather(); Update(); } @@ -653,6 +652,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);