Skip to content

Commit 30c2676

Browse files
committed
subghz fix crash and wrong states
1 parent 09597ca commit 30c2676

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

applications/main/subghz/scenes/subghz_scene_frequency_analyzer.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ bool subghz_scene_frequency_analyzer_on_event(void* context, SceneManagerEvent e
6969

7070
return true;
7171
} else if(event.event == SubGhzCustomEventViewFreqAnalOkLong) {
72-
// Don't need to save, we already saved on short event
73-
//scene_manager_set_scene_state(subghz->scene_manager, SubGhzSceneStart, 10);
72+
// Don't need to save, we already saved on short event (and on exit event too)
73+
subghz_rx_key_state_set(subghz, SubGhzRxKeyStateIDLE);
74+
scene_manager_set_scene_state(subghz->scene_manager, SubGhzSceneStart, 10);
7475
scene_manager_next_scene(subghz->scene_manager, SubGhzSceneReceiver);
7576
return true;
7677
}

applications/main/subghz/scenes/subghz_scene_receiver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ static void subghz_scene_add_to_history_callback(
146146
if(subghz_history_get_text_space_left(subghz->history, NULL)) {
147147
notification_message(subghz->notifications, &sequence_error);
148148
}
149+
subghz_rx_key_state_set(subghz, SubGhzRxKeyStateAddKey);
149150
}
150151
subghz_receiver_reset(receiver);
151152
furi_string_free(item_name);
152153
furi_string_free(item_time);
153-
subghz_rx_key_state_set(subghz, SubGhzRxKeyStateAddKey);
154154
} else {
155155
FURI_LOG_D(TAG, "%s protocol ignored", decoder_base->protocol->name);
156156
}

0 commit comments

Comments
 (0)