Merge pull request #103 from jamisonderek/dev

JS: Fix widget sometimes MemCrash on exit.
Next-Flip · Apr 20, 2024 · f2a6ad6 · f2a6ad6
2 parents e3cc377 + 17646ca
commit f2a6ad6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/applications/system/js_app/modules/js_widget.c b/applications/system/js_app/modules/js_widget.c
@@ -917,9 +917,8 @@ static void widget_remove_view(void* context) {
                 ComponentArray_it(it, model->component);
                 while(!ComponentArray_end_p(it)) {
                     WidgetComponent* component = *ComponentArray_ref(it);
-                    if(component->free) {
+                    if(component && component->free) {
                         component->free(component);
-                        component->free = NULL;
                     }
                     ComponentArray_next(it);
                 }
@@ -1003,6 +1002,7 @@ static void js_widget_destroy(void* inst) {
         view_dispatcher_stop(widget->view_dispatcher);
         widget_deinit(widget);
     }
+
     widget_remove_view(widget);
     free(widget);
 }