Skip to content

Commit 7172669

Browse files
committed
Fix view alloc/free
by Willy-JL
1 parent 8245889 commit 7172669

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

non_catalog_apps/chess/flipchess.c

+7-4
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ FlipChess* flipchess_app_alloc() {
7474
app->view_dispatcher, flipchess_tick_event_callback, 100);
7575
view_dispatcher_set_custom_event_callback(
7676
app->view_dispatcher, flipchess_custom_event_callback);
77-
app->submenu = submenu_alloc();
7877

7978
// Settings
8079
app->haptic = FlipChessHapticOn;
@@ -89,6 +88,7 @@ FlipChess* flipchess_app_alloc() {
8988
// Text input
9089
app->input_state = FlipChessTextInputDefault;
9190

91+
app->submenu = submenu_alloc();
9292
view_dispatcher_add_view(
9393
app->view_dispatcher, FlipChessViewIdMenu, submenu_get_view(app->submenu));
9494
app->flipchess_startscreen = flipchess_startscreen_alloc();
@@ -131,14 +131,17 @@ void flipchess_app_free(FlipChess* app) {
131131
// Scene manager
132132
scene_manager_free(app->scene_manager);
133133

134-
text_input_free(app->text_input);
135-
136134
// View Dispatcher
137135
view_dispatcher_remove_view(app->view_dispatcher, FlipChessViewIdMenu);
136+
submenu_free(app->submenu);
137+
view_dispatcher_remove_view(app->view_dispatcher, FlipChessViewIdStartscreen);
138+
flipchess_startscreen_free(app->flipchess_startscreen);
138139
view_dispatcher_remove_view(app->view_dispatcher, FlipChessViewIdScene1);
140+
flipchess_scene_1_free(app->flipchess_scene_1);
139141
view_dispatcher_remove_view(app->view_dispatcher, FlipChessViewIdSettings);
142+
variable_item_list_free(app->variable_item_list);
140143
view_dispatcher_remove_view(app->view_dispatcher, FlipChessViewIdTextInput);
141-
submenu_free(app->submenu);
144+
text_input_free(app->text_input);
142145

143146
view_dispatcher_free(app->view_dispatcher);
144147
furi_record_close(RECORD_GUI);

non_catalog_apps/uhf_rfid/uhf_app.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ UHFApp* uhf_alloc() {
111111
void uhf_free(UHFApp* uhf_app) {
112112
furi_assert(uhf_app);
113113

114+
// Variable Item List
115+
view_dispatcher_remove_view(uhf_app->view_dispatcher, UHFViewVariableItemList);
116+
variable_item_list_free(uhf_app->variable_item_list);
117+
114118
// Submenu
115119
view_dispatcher_remove_view(uhf_app->view_dispatcher, UHFViewMenu);
116120
submenu_free(uhf_app->submenu);
@@ -151,9 +155,6 @@ void uhf_free(UHFApp* uhf_app) {
151155
furi_record_close(RECORD_GUI);
152156
uhf_app->gui = NULL;
153157

154-
// Variable Item List
155-
variable_item_list_free(uhf_app->variable_item_list);
156-
157158
// Notifications
158159
furi_record_close(RECORD_NOTIFICATION);
159160
uhf_app->notifications = NULL;

0 commit comments

Comments
 (0)