From 59fe2376c21a7a4b4ede47518bbc7de06e86b493 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Fri, 1 Mar 2024 06:12:34 +0000 Subject: [PATCH] Fix crash on frequency remove for leftmost index --- .../scenes/momentum_app_scene_protocols_freqs_hopper.c | 2 +- .../scenes/momentum_app_scene_protocols_freqs_static.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/main/momentum_app/scenes/momentum_app_scene_protocols_freqs_hopper.c b/applications/main/momentum_app/scenes/momentum_app_scene_protocols_freqs_hopper.c index aada8de42..5ee2e5629 100644 --- a/applications/main/momentum_app/scenes/momentum_app_scene_protocols_freqs_hopper.c +++ b/applications/main/momentum_app/scenes/momentum_app_scene_protocols_freqs_hopper.c @@ -87,7 +87,7 @@ bool momentum_app_scene_protocols_freqs_hopper_on_event(void* context, SceneMana variable_item_list_get(app->var_item_list, VarItemListIndexHopperFrequency); variable_item_set_values_count(item, FrequencyList_size(app->subghz_hopper_freqs)); if(FrequencyList_size(app->subghz_hopper_freqs)) { - app->subghz_hopper_index -= removed; + app->subghz_hopper_index -= MIN(removed, app->subghz_hopper_index); uint32_t value = *FrequencyList_get(app->subghz_hopper_freqs, app->subghz_hopper_index); char text[10] = {0}; diff --git a/applications/main/momentum_app/scenes/momentum_app_scene_protocols_freqs_static.c b/applications/main/momentum_app/scenes/momentum_app_scene_protocols_freqs_static.c index bf8870d11..f6e226238 100644 --- a/applications/main/momentum_app/scenes/momentum_app_scene_protocols_freqs_static.c +++ b/applications/main/momentum_app/scenes/momentum_app_scene_protocols_freqs_static.c @@ -87,7 +87,7 @@ bool momentum_app_scene_protocols_freqs_static_on_event(void* context, SceneMana variable_item_list_get(app->var_item_list, VarItemListIndexStaticFrequency); variable_item_set_values_count(item, FrequencyList_size(app->subghz_static_freqs)); if(FrequencyList_size(app->subghz_static_freqs)) { - app->subghz_static_index -= removed; + app->subghz_static_index -= MIN(removed, app->subghz_static_index); uint32_t value = *FrequencyList_get(app->subghz_static_freqs, app->subghz_static_index); char text[10] = {0};