Update nfc_playlist_scene_emulation.c

scenes/nfc_playlist_scene_emulation.c

@@ -20,11 +20,10 @@ int32_t nfc_playlist_emulation_task(void* context) {
 
    view_dispatcher_switch_to_view(nfc_playlist->view_dispatcher, NfcPlaylistView_Popup);
 
-   if (nfc_playlist->settings.playlist_length == 0) {
+   if(nfc_playlist->settings.playlist_length == 0) {
       popup_set_header(nfc_playlist->popup, "The playlist you have\nselected is empty", 64, 10, AlignCenter, AlignTop);
-   } else if (file_stream_open(stream, furi_string_get_cstr(nfc_playlist->settings.playlist_path), FSAM_READ, FSOM_OPEN_EXISTING)) {
+   } else if(file_stream_open(stream, furi_string_get_cstr(nfc_playlist->settings.playlist_path), FSAM_READ, FSOM_OPEN_EXISTING)) {
       EmulationState = NfcPlaylistEmulationState_Emulating;
-      int file_position = 0;
 
       FuriString* line = furi_string_alloc();
       FuriString* tmp_header_str = furi_string_alloc();
@@ -32,6 +31,9 @@ int32_t nfc_playlist_emulation_task(void* context) {
       FuriString* tmp_file_name = furi_string_alloc();
       FuriString* tmp_file_ext = furi_string_alloc();
 
+      bool delay_setting_on = nfc_playlist->settings.emulate_delay > 0;
+      bool delay_active = false;
+
       while(stream_read_line(stream, line) && EmulationState == NfcPlaylistEmulationState_Emulating) {
 
          char* file_path = (char*)furi_string_get_cstr(line);
@@ -40,20 +42,23 @@ int32_t nfc_playlist_emulation_task(void* context) {
             continue;
          }
 
-         if (nfc_playlist->settings.emulate_delay > 0 && file_position != 0 && !skip_delay) {
-            popup_set_header(nfc_playlist->popup, "Delaying", 64, 10, AlignCenter, AlignTop);
-            start_blink(nfc_playlist, NfcPlaylistLedState_Error);
-            int time_counter_delay_ms = (options_emulate_delay[nfc_playlist->settings.emulate_delay]*1000);
-            while(time_counter_delay_ms > 0 && EmulationState == NfcPlaylistEmulationState_Emulating) {
-               furi_string_printf(tmp_counter_str,  "%ds", (time_counter_delay_ms/1000));
-               popup_set_text(nfc_playlist->popup, furi_string_get_cstr(tmp_counter_str), 64, 50, AlignCenter, AlignTop);
-               furi_delay_ms(50);
-               time_counter_delay_ms -= 50;
-               furi_string_reset(tmp_counter_str);
-            };
-         } else if (nfc_playlist->settings.emulate_delay > 0) {
-            skip_delay = false;
-            file_position++;
+         if(delay_setting_on) {
+            if(delay_active && !skip_delay) {
+               popup_set_header(nfc_playlist->popup, "Delaying", 64, 10, AlignCenter, AlignTop);
+               start_blink(nfc_playlist, NfcPlaylistLedState_Error);
+               int time_counter_delay_ms = (options_emulate_delay[nfc_playlist->settings.emulate_delay]*1000);
+               while(time_counter_delay_ms > 0 && EmulationState == NfcPlaylistEmulationState_Emulating) {
+                  furi_string_printf(tmp_counter_str,  "%ds", (time_counter_delay_ms/1000));
+                  popup_set_text(nfc_playlist->popup, furi_string_get_cstr(tmp_counter_str), 64, 50, AlignCenter, AlignTop);
+                  furi_string_reset(tmp_counter_str);
+                  furi_delay_ms(50);
+                  time_counter_delay_ms -= 50;
+               };
+            } else if(!delay_active) {
+               delay_active = true;
+            } else if(skip_delay) {
+               skip_delay = false
+            }
          }
 
          if(EmulationState != NfcPlaylistEmulationState_Emulating) {break;}