From 01c80f786876d49e435434e8a1a83373df2c68c6 Mon Sep 17 00:00:00 2001 From: kevin koenig Date: Wed, 23 Feb 2022 06:48:48 -0500 Subject: [PATCH] fix possible race condition in lcdFlush --- radio/src/gui/colorlcd/lcd.cpp | 5 ++++- radio/src/thirdparty/libopenui | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/colorlcd/lcd.cpp b/radio/src/gui/colorlcd/lcd.cpp index 33898ad00..4dddeafe6 100644 --- a/radio/src/gui/colorlcd/lcd.cpp +++ b/radio/src/gui/colorlcd/lcd.cpp @@ -143,7 +143,10 @@ void lcdRefresh() void lcdFlushed() { - lv_disp_flush_ready(refr_disp); + // its possible to get here before flushLcd is ever called. + // so check for nullptr first. (Race condition if you put breakpoints in startup code) + if (refr_disp != nullptr) + lv_disp_flush_ready(refr_disp); } //TODO: move this somewhere else diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index 31824ab1f..03109134c 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit 31824ab1f0379ff9d204c8e6abaea608579cb594 +Subproject commit 03109134cebc2a696603d9ee118dd05ad9d3a28c