From 35a54dbd614e5045d039424f895cb857c7514edd Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Thu, 10 Mar 2022 09:45:12 +0100
Subject: [PATCH] Fixed auto-seeking when adding tracks to an existing track
 selection

---
 src/output/output.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/output/output.cpp b/src/output/output.cpp
index c3a37230..5c785bb0 100644
--- a/src/output/output.cpp
+++ b/src/output/output.cpp
@@ -535,11 +535,15 @@ namespace Mist{
     if (autoSeek){
       buffer.clear();
       INFO_MSG("Automatically seeking to resume playback");
-      for (std::set<size_t>::iterator it = newSelects.begin(); it != newSelects.end(); it++){
-        if (seekTargets.count(*it)){
-          seek(*it, seekTargets[*it], false);
-        }else{
-          seek(*it, 0, false);
+      if (!seekTargets.size()){
+        initialSeek();
+      }else{
+        for (std::set<size_t>::iterator it = newSelects.begin(); it != newSelects.end(); it++){
+          if (seekTargets.count(*it)){
+            seek(*it, seekTargets[*it], false);
+          }else{
+            seek(*it, seekTargets.begin()->second, false);
+          }
         }
       }
     }