From 46cf6f8c97fc8b7376eaa0615e98eb342b49cdb5 Mon Sep 17 00:00:00 2001
From: Alex <github@alexstewart.app>
Date: Wed, 18 Dec 2019 03:07:52 -0500
Subject: [PATCH] Bug Fixes with Music playing

---
 src/commands/music/CommandMusicMain.java   |  1 -
 src/commands/music/SubCommandPlaylist.java |  2 +-
 src/commands/music/SubCommandStop.java     |  3 +--
 src/utils/audio/AudioUtils.java            | 22 ++++++++++++++++------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/commands/music/CommandMusicMain.java b/src/commands/music/CommandMusicMain.java
index 6581271..7e71fc6 100644
--- a/src/commands/music/CommandMusicMain.java
+++ b/src/commands/music/CommandMusicMain.java
@@ -27,7 +27,6 @@ public class CommandMusicMain extends Command
 	public void onRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input, Response res)
 	{
 		SubCommandFormattable scf = framework.run(guild, channel, user, input);
-		System.out.println("SCF: " + scf.resString);
 		scf.Call(res);
 	}
 }
\ No newline at end of file
diff --git a/src/commands/music/SubCommandPlaylist.java b/src/commands/music/SubCommandPlaylist.java
index ec81859..b6c2a3f 100644
--- a/src/commands/music/SubCommandPlaylist.java
+++ b/src/commands/music/SubCommandPlaylist.java
@@ -35,4 +35,4 @@ public class SubCommandPlaylist extends SubCommand
 		return new SubCommandFormattable(stringPlaylist);
 	}
 
-}
+}
\ No newline at end of file
diff --git a/src/commands/music/SubCommandStop.java b/src/commands/music/SubCommandStop.java
index 2aacffd..1422792 100644
--- a/src/commands/music/SubCommandStop.java
+++ b/src/commands/music/SubCommandStop.java
@@ -17,8 +17,7 @@ public class SubCommandStop extends SubCommand
 	@Override
 	public SubCommandFormattable OnRun(KittyGuild guild, KittyChannel channel, KittyUser user, UserInput input) 
 	{
-		
 		return new SubCommandFormattable(guild.audio.stopPlayer(guild.audio.player));
 	}
 	
-}
+}
\ No newline at end of file
diff --git a/src/utils/audio/AudioUtils.java b/src/utils/audio/AudioUtils.java
index fa99919..3dbaaf3 100644
--- a/src/utils/audio/AudioUtils.java
+++ b/src/utils/audio/AudioUtils.java
@@ -104,9 +104,9 @@ public class AudioUtils
 			{
 				playlist.add(track);
 			}
-			if(!isPlaying)
+			
+			if(player.getPlayingTrack() == null)
 			{
-				isPlaying = true;
 				startPlay(player);
 			}
 		}
@@ -118,21 +118,31 @@ public class AudioUtils
 		guild.getAudioManager().setSendingHandler(new AudioPlayerSendHandler(player));
 		playerManager.loadItemOrdered(player, videoURL, new SmallAudio(player));
 		
+		
 		return null;
 	}
 	
 	private void startPlay(AudioPlayer player)
 	{
+		isPlaying = false;
 		do 
 		{
 			if(player.getPlayingTrack() == null)
 			{
-				player.startTrack(playlist.get(0), false);
-				if(!playlist.isEmpty())
-					playlist.remove(0);
+				if(playlist.isEmpty())
+				{
+					isPlaying = false;
+				}
+				else
+				{
+					player.startTrack(playlist.get(0), false);
+					
+					if(!playlist.isEmpty())
+						playlist.remove(0);
+				}
 			}
 		}
-		while(!playlist.isEmpty());
+		while(isPlaying);
 		isPlaying = false;
 	}