Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-07-23 01:18:12 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '420' of https://github.com/RogueMaster/flipperzero-firmware-wPlugins into Dev

Browse Source
This commit is contained in:
VerstreuteSeele
2022-12-19 21:52:58 +01:00
parent 4ed4ea7f4d 84c2161a6a
commit 792ec90d86
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/main/nfc/nfc.c
+1 -1
View File
@@ -47,7 +47,7 @@ Nfc* nfc_alloc() {
// Nfc device
nfc->dev = nfc_device_alloc();
furi_string_set(nfc->dev->folder, NFC_APP_FOLDER);
// Open GUI record
nfc->gui = furi_record_open(RECORD_GUI);
applications/plugins/nfc_magic/nfc_magic.c
+1 -1
View File
@@ -50,7 +50,7 @@ NfcMagic* nfc_magic_alloc() {
// Nfc device
nfc_magic->nfc_dev = nfc_device_alloc();
furi_string_set(nfc_magic->nfc_dev->folder, NFC_APP_FOLDER);
// Open GUI record
nfc_magic->gui = furi_record_open(RECORD_GUI);
view_dispatcher_attach_to_gui(
lib/nfc/nfc_device.c
+6 -2
View File
@@ -1362,7 +1362,7 @@ bool nfc_device_save(NfcDevice* dev, const char* dev_name) {
break;
}
furi_string_free(folder);
// First remove nfc device file if it was saved
// Open file
if(!flipper_format_file_open_always(file, furi_string_get_cstr(temp_str))) break;
// Write header
@@ -1611,7 +1611,11 @@ bool nfc_device_delete(NfcDevice* dev, bool use_load_path) {
furi_string_set(file_path, dev->load_path);
} else {
furi_string_printf(
file_path, "%s/%s%s", NFC_APP_FOLDER, dev->dev_name, NFC_APP_EXTENSION);
file_path,
"%s/%s%s",
furi_string_get_cstr(dev->folder),
dev->dev_name,
NFC_APP_EXTENSION);
}
if(!storage_simply_remove(dev->storage, furi_string_get_cstr(file_path))) break;
// Delete shadow file if it exists