From c1626da40d18d76444cd771f3332841a7b30fa97 Mon Sep 17 00:00:00 2001
From: Chris Miles <akkadius1@gmail.com>
Date: Wed, 28 Sep 2022 21:29:04 -0500
Subject: [PATCH] [Crash] Websocket Crash fix race when fetching log categories
 (#2456)

* [Crash] Websocket crash fix race

* Refine check
---
 zone/api_service.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zone/api_service.cpp b/zone/api_service.cpp
index 307cebf17..2b2119533 100644
--- a/zone/api_service.cpp
+++ b/zone/api_service.cpp
@@ -829,7 +829,7 @@ Json::Value ApiGetZoneAttributes(EQ::Net::WebsocketServerConnection *connection,
 
 Json::Value ApiGetLogsysCategories(EQ::Net::WebsocketServerConnection *connection, Json::Value params)
 {
-	if (zone->GetZoneID() == 0) {
+	if (!zone || (zone && zone->GetZoneID() == 0)) {
 		throw EQ::Net::WebsocketException("Zone must be loaded to invoke this call");
 	}