From 040dded2a68ba442c291a275f36b86a4466156fc Mon Sep 17 00:00:00 2001
From: Jimi Sanchez <jimi.linuxguy@gmail.com>
Date: Mon, 19 Sep 2022 17:35:28 -0400
Subject: [PATCH] Merges latest firmware into feature branch

---
 firmware/application/apps/ui_playlist.cpp | 4 ++++
 firmware/application/apps/ui_playlist.hpp | 1 +
 2 files changed, 5 insertions(+)

diff --git a/firmware/application/apps/ui_playlist.cpp b/firmware/application/apps/ui_playlist.cpp
index 951877e5..835cf5b4 100644
--- a/firmware/application/apps/ui_playlist.cpp
+++ b/firmware/application/apps/ui_playlist.cpp
@@ -62,6 +62,7 @@ void PlaylistView::set_ready() {
 				txtline_process(line); 
 			}
 		}
+		playlist_masterdb = playlist_db;
 		return ;
 		}
 
@@ -215,6 +216,9 @@ void PlaylistView::stop(const bool do_loop) {
 	if (do_loop) {
 		if (playlist_db.size() > 0 ) {
 			start();
+		} else {
+			playlist_db = playlist_masterdb;
+			start();
 		}
 	} else {
 		radio::set_antenna_bias(false);    //Turn off Bias Tee
diff --git a/firmware/application/apps/ui_playlist.hpp b/firmware/application/apps/ui_playlist.hpp
index 399a8c6c..228a0a50 100644
--- a/firmware/application/apps/ui_playlist.hpp
+++ b/firmware/application/apps/ui_playlist.hpp
@@ -57,6 +57,7 @@ private:
 		uint32_t next_delay{};
 	};
 	std::deque<playlist_entry> playlist_db{};
+	std::deque<playlist_entry> playlist_masterdb{};
 	uint32_t sample_rate = 0;
 	int32_t tx_gain { 47 };
 	bool rf_amp { true }; // aux private var to store temporal, Replay App rf_amp user selection.