From 5b95194d046eaa99f71850155439f460f15e3dd1 Mon Sep 17 00:00:00 2001
From: Himura Kazuto <glagol15@gmail.com>
Date: Tue, 28 Jan 2020 20:58:09 +0300
Subject: [PATCH] Fix inability to switch tracks emergently

---
 src/main.pyw | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.pyw b/src/main.pyw
index a7f3964..a5b5cc0 100644
--- a/src/main.pyw
+++ b/src/main.pyw
@@ -952,10 +952,10 @@ class MainWindow(wx.Frame):
     # -------------------------------------------------- Player --------------------------------------------------
 
     def play_async(self, e=None):
-        if self.is_playing:
+        num = self.get_num(self.grid.GetGridCursorRow())
+        if self.is_playing and self.num_in_player == num:
             self.status(_("ALREADY PLAYING! Hit Esc to restart!"))
             return
-        num = self.get_num(self.grid.GetGridCursorRow())
         if num == 'countdown':
             notes = self.grid.GetCellValue(self.grid.GetGridCursorRow(), self.grid_cols.index(Columns.NOTES))
             self.ensure_proj_win()