Exit messages

2 files changed, 9 insertions, 4 deletions

diff --git a/src/client/Main.hx b/src/client/Main.hx
index 31bd580..73f733c 100644
--- a/src/client/Main.hx
+++ b/src/client/Main.hx
@@ -224,7 +224,7 @@ class Main {
 		var first:Null<T> = null;
 		if (player.isListEmpty()) first = items.shift();
 		items.reverse();
-		if (player.isListEmpty()) items.unshift(first);
+		if (first != null) items.unshift(first);
 	}
 
 	function addVideoArray(links:Array<String>, atEnd:Bool, isTemp:Bool):Void {
diff --git a/src/server/Main.hx b/src/server/Main.hx
index 85006c7..8a5f381 100644
--- a/src/server/Main.hx
+++ b/src/server/Main.hx
@@ -110,9 +110,6 @@ class Main {
 					continue;
 				}
 				client.ws.terminate();
-				onMessage(client, {
-					type: Disconnected
-				}, true);
 			}
 		};
 	}
@@ -364,6 +361,14 @@ class Main {
 					if (waitVideoStart != null) waitVideoStart.stop();
 					videoTimer.pause();
 				}
+				Timer.delay(() -> {
+					if (clients.exists(i -> i.name == client.name)) return;
+					broadcast({
+						type: ServerMessage, serverMessage: {
+							textId: '${client.name} has left'
+						}
+					});
+				}, 5000);
 
 			case UpdateClients:
 				sendClientList();