From 730f1b6ecf5fbcdbd3e7d53d6ae14974085c1264 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Mon, 10 Mar 2025 02:23:06 +0000
Subject: [PATCH] Fix event struct passed to callbacks

---
 lib/nfc/protocols/type_4_tag/type_4_tag_poller.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/nfc/protocols/type_4_tag/type_4_tag_poller.c b/lib/nfc/protocols/type_4_tag/type_4_tag_poller.c
index ee09d8a68..79f20152c 100644
--- a/lib/nfc/protocols/type_4_tag/type_4_tag_poller.c
+++ b/lib/nfc/protocols/type_4_tag/type_4_tag_poller.c
@@ -100,6 +100,7 @@ static NfcCommand type_4_tag_poller_handler_read_ndef(Type4TagPoller* instance)
 static NfcCommand type_4_tag_poller_handler_read_fail(Type4TagPoller* instance) {
     FURI_LOG_D(TAG, "Read Failed");
     iso14443_4a_poller_halt(instance->iso14443_4a_poller);
+    instance->type_4_tag_event.type = Type4TagPollerEventTypeReadFailed;
     instance->type_4_tag_event.data->error = instance->error;
     NfcCommand command = instance->callback(instance->general_event, instance->context);
     instance->state = Type4TagPollerStateIdle;
@@ -150,6 +151,8 @@ static NfcCommand type_4_tag_poller_run(NfcGenericEvent event, void* context) {
         command = type_4_tag_poller_read_handler[instance->state](instance);
     } else if(iso14443_4a_event->type == Iso14443_4aPollerEventTypeError) {
         instance->type_4_tag_event.type = Type4TagPollerEventTypeReadFailed;
+        instance->type_4_tag_event.data->error =
+            type_4_tag_process_error(iso14443_4a_event->data->error);
         command = instance->callback(instance->general_event, instance->context);
     }