Просмотр исходного кода

Fix view alloc/free

by Willy-JL
MX 1 год назад
Родитель
Сommit
36011d014b
1 измененных файлов с 7 добавлено и 4 удалено
  1. 7 4
      flipchess.c

+ 7 - 4
flipchess.c

@@ -74,7 +74,6 @@ FlipChess* flipchess_app_alloc() {
         app->view_dispatcher, flipchess_tick_event_callback, 100);
         app->view_dispatcher, flipchess_tick_event_callback, 100);
     view_dispatcher_set_custom_event_callback(
     view_dispatcher_set_custom_event_callback(
         app->view_dispatcher, flipchess_custom_event_callback);
         app->view_dispatcher, flipchess_custom_event_callback);
-    app->submenu = submenu_alloc();
 
 
     // Settings
     // Settings
     app->haptic = FlipChessHapticOn;
     app->haptic = FlipChessHapticOn;
@@ -89,6 +88,7 @@ FlipChess* flipchess_app_alloc() {
     // Text input
     // Text input
     app->input_state = FlipChessTextInputDefault;
     app->input_state = FlipChessTextInputDefault;
 
 
+    app->submenu = submenu_alloc();
     view_dispatcher_add_view(
     view_dispatcher_add_view(
         app->view_dispatcher, FlipChessViewIdMenu, submenu_get_view(app->submenu));
         app->view_dispatcher, FlipChessViewIdMenu, submenu_get_view(app->submenu));
     app->flipchess_startscreen = flipchess_startscreen_alloc();
     app->flipchess_startscreen = flipchess_startscreen_alloc();
@@ -131,14 +131,17 @@ void flipchess_app_free(FlipChess* app) {
     // Scene manager
     // Scene manager
     scene_manager_free(app->scene_manager);
     scene_manager_free(app->scene_manager);
 
 
-    text_input_free(app->text_input);
-
     // View Dispatcher
     // View Dispatcher
     view_dispatcher_remove_view(app->view_dispatcher, FlipChessViewIdMenu);
     view_dispatcher_remove_view(app->view_dispatcher, FlipChessViewIdMenu);
+    submenu_free(app->submenu);
+    view_dispatcher_remove_view(app->view_dispatcher, FlipChessViewIdStartscreen);
+    flipchess_startscreen_free(app->flipchess_startscreen);
     view_dispatcher_remove_view(app->view_dispatcher, FlipChessViewIdScene1);
     view_dispatcher_remove_view(app->view_dispatcher, FlipChessViewIdScene1);
+    flipchess_scene_1_free(app->flipchess_scene_1);
     view_dispatcher_remove_view(app->view_dispatcher, FlipChessViewIdSettings);
     view_dispatcher_remove_view(app->view_dispatcher, FlipChessViewIdSettings);
+    variable_item_list_free(app->variable_item_list);
     view_dispatcher_remove_view(app->view_dispatcher, FlipChessViewIdTextInput);
     view_dispatcher_remove_view(app->view_dispatcher, FlipChessViewIdTextInput);
-    submenu_free(app->submenu);
+    text_input_free(app->text_input);
 
 
     view_dispatcher_free(app->view_dispatcher);
     view_dispatcher_free(app->view_dispatcher);
     furi_record_close(RECORD_GUI);
     furi_record_close(RECORD_GUI);