From 43ef3d9bff2ee604ea6e57b301fc01a58e635f48 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Fri, 3 Mar 2023 07:34:49 +0300
Subject: [PATCH] Fix ibutton app - add manually - duplicate names

---
 .../ibutton/scenes/ibutton_scene_add_type.c   | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/applications/main/ibutton/scenes/ibutton_scene_add_type.c b/applications/main/ibutton/scenes/ibutton_scene_add_type.c
index 968bbac1c..55e05f20d 100644
--- a/applications/main/ibutton/scenes/ibutton_scene_add_type.c
+++ b/applications/main/ibutton/scenes/ibutton_scene_add_type.c
@@ -8,11 +8,20 @@ void ibutton_scene_add_type_on_enter(void* context) {
 
     for(uint32_t protocol_id = 0; protocol_id < ibutton_protocols_get_protocol_count();
         ++protocol_id) {
-        furi_string_printf(
-            tmp,
-            "%s %s",
-            ibutton_protocols_get_manufacturer(ibutton->protocols, protocol_id),
-            ibutton_protocols_get_name(ibutton->protocols, protocol_id));
+        if((strcmp(
+                ibutton_protocols_get_manufacturer(ibutton->protocols, protocol_id),
+                ibutton_protocols_get_name(ibutton->protocols, protocol_id)) != 0) &&
+           (strcmp(ibutton_protocols_get_manufacturer(ibutton->protocols, protocol_id), "N/A") !=
+            0)) {
+            furi_string_printf(
+                tmp,
+                "%s %s",
+                ibutton_protocols_get_manufacturer(ibutton->protocols, protocol_id),
+                ibutton_protocols_get_name(ibutton->protocols, protocol_id));
+        } else {
+            furi_string_printf(
+                tmp, "%s", ibutton_protocols_get_name(ibutton->protocols, protocol_id));
+        }
 
         submenu_add_item(
             submenu, furi_string_get_cstr(tmp), protocol_id, ibutton_submenu_callback, context);