Fix switching between tracks

gui.go

@@ -302,7 +302,8 @@ func handleMpvEvents(ui *Ui) {
 		e := <-ui.player.EventChannel
 		if e == nil {
 			break
-		} else if e.Event_Id == mpv.EVENT_END_FILE {
+			// we don't want to update anything if we're in the process of replacing the current track
+		} else if e.Event_Id == mpv.EVENT_END_FILE && !ui.player.ReplaceInProgress {
 			ui.startStopStatus.SetText("[::b]stmp: [red]stopped")
 			// TODO it's gross that this is here, need better event handling
 			if len(ui.player.Queue) > 0 {
@@ -311,6 +312,7 @@ func handleMpvEvents(ui *Ui) {
 			updateQueueList(ui.player, ui.queueList)
 			ui.player.PlayNextTrack()
 		} else if e.Event_Id == mpv.EVENT_START_FILE {
+			ui.player.ReplaceInProgress = false
 			ui.startStopStatus.SetText("[::b]stmp: [green]playing " + ui.player.Queue[0].Title)
 			updateQueueList(ui.player, ui.queueList)
 		}

player.go

@@ -17,9 +17,10 @@ type QueueItem struct {
 }
 
 type Player struct {
-	Instance     *mpv.Mpv
-	EventChannel chan *mpv.Event
-	Queue        []QueueItem
+	Instance          *mpv.Mpv
+	EventChannel      chan *mpv.Event
+	Queue             []QueueItem
+	ReplaceInProgress bool
 }
 
 func eventListener(m *mpv.Mpv) chan *mpv.Event {
@@ -46,7 +47,7 @@ func InitPlayer() (*Player, error) {
 		return nil, err
 	}
 
-	return &Player{mpvInstance, eventListener(mpvInstance), nil}, nil
+	return &Player{mpvInstance, eventListener(mpvInstance), nil, false}, nil
 }
 
 func (p *Player) PlayNextTrack() {
@@ -57,6 +58,7 @@ func (p *Player) PlayNextTrack() {
 
 func (p *Player) Play(uri string, title string, artist string) {
 	p.Queue = []QueueItem{QueueItem{uri, title, artist}}
+	p.ReplaceInProgress = true
 	p.Instance.Command([]string{"loadfile", uri})
 }