Merge branch 'dev' into release

DarkFlippers · Mar 24, 2024 · 8b62b6c · 8b62b6c
2 parents 79ac603 + 81a16e5
commit 8b62b6c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 * NFC: **Kazan parser improved** - token parse option added (by @Leptopt1los)
 * NFC: **Update ndef parser**, mf classic dict changes (by @Willy-JL)
 * RFID: Test swap of em4100 t5577 blocks (details in issue 3463 OFW)
+* RFID: Fix RAW read crash (by @Willy-JL)
 * Infrared: Update universal remote assets (by @amec0e | PR #718 #719)
 * SubGHz: Add 430.50 mhz (by @MizumasuShoichi | PR #721)
 * SubGHz: **Magellan Event Code Update** (by @wooferguy | PR #713)

diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c b/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c
@@ -88,6 +88,8 @@ bool lfrfid_scene_raw_read_on_event(void* context, SceneManagerEvent event) {
                         popup, "Reading\nRAW RFID\nPSK", 89, 30, AlignCenter, AlignTop);
                     notification_message(app->notifications, &sequence_blink_start_yellow);
                     lfrfid_worker_stop(app->lfworker);
+                    lfrfid_worker_stop_thread(app->lfworker);
+                    lfrfid_worker_start_thread(app->lfworker);
                     furi_string_printf(
                         state->string_file_name,
                         "%s/%s%s",