From da2723be30e6f172ce3ebcf59e5e8f5314970c05 Mon Sep 17 00:00:00 2001
From: Matt Atlas <mattiathebest2000@hotmail.it>
Date: Tue, 31 Aug 2021 18:05:15 +0200
Subject: [PATCH] Removes double chat startup upon unauth login (#12175)

---
 code/modules/client/asset_cache.dm | 12 ++----------
 code/modules/mob/login.dm          |  4 ++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm
index a4b685b10db..6c6e82475d3 100644
--- a/code/modules/client/asset_cache.dm
+++ b/code/modules/client/asset_cache.dm
@@ -50,11 +50,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 	client.sending |= asset_name
 	var/job = ++client.last_asset_job
 
-	client << browse({"
-	<script>
-		window.location.href="?asset_cache_confirm_arrival=[job]"
-	</script>
-	"}, "window=asset_cache_browser")
+	client << browse("<script>window.location.href=\"?asset_cache_confirm_arrival=[job]\"</script>", "window=asset_cache_browser")
 
 	var/t = 0
 	var/timeout_time = (ASSET_CACHE_SEND_TIMEOUT * client.sending.len) + ASSET_CACHE_SEND_TIMEOUT
@@ -102,11 +98,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 	client.sending |= unreceived
 	var/job = ++client.last_asset_job
 
-	client << browse({"
-	<script>
-		window.location.href="?asset_cache_confirm_arrival=[job]"
-	</script>
-	"}, "window=asset_cache_browser")
+	client << browse("<script>window.location.href=\"?asset_cache_confirm_arrival=[job]\"</script>", "window=asset_cache_browser")
 
 	var/t = 0
 	var/timeout_time = ASSET_CACHE_SEND_TIMEOUT * client.sending.len
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 9a551a772da..e354d576bba 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -71,8 +71,6 @@
 
 	player_age = client.player_age
 
-	client.chatOutput.start()
-
 	if(loc && !isturf(loc))
 		client.eye = loc
 		client.perspective = EYE_PERSPECTIVE
@@ -95,3 +93,5 @@
 
 	// Check code/modules/admin/verbs/antag-ooc.dm for definition
 	client.add_aooc_if_necessary()
+
+	client.chatOutput.start()