Fix LVGL 8.4 crash post delete screens

xperiments-in · Jun 19, 2024 · ba4e25a · ba4e25a
1 parent aef9f83
commit ba4e25a
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/ui/ui_loaders.c b/src/ui/ui_loaders.c
@@ -44,12 +44,7 @@ void fillScreenData(int screen)
 void loadScreen(int screen)
 {
     xTouchConfig.currentScreenIndex = screen;
-    lv_obj_t *current = lv_scr_act();
-    if (current != NULL)
-    {
-        lv_obj_clean(current);
-        lv_obj_del(current);
-    }
+    lv_obj_t *previousScreen = lv_scr_act();
 
     switch (screen)
     {
@@ -93,6 +88,12 @@ void loadScreen(int screen)
     {
         ui_sidebarComponent_set_active(screen);
     }
+
+    if (previousScreen != NULL)
+    {
+        lv_obj_clean(previousScreen);
+        lv_obj_del(previousScreen);
+    }
 }
 
 void initTopLayer()