websocketserver: Check for EventHandler validity in de/constructor

Redundant fix for shutdown crash
obsproject · Nov 14, 2023 · 07537a3 · 07537a3
1 parent efeae8d
commit 07537a3
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/websocketserver/WebSocketServer.cpp b/src/websocketserver/WebSocketServer.cpp
@@ -49,14 +49,21 @@ WebSocketServer::WebSocketServer() : QObject(nullptr)
 							   websocketpp::lib::placeholders::_2));
 
 	auto eventHandler = GetEventHandler();
-	eventHandler->SetBroadcastCallback(std::bind(&WebSocketServer::BroadcastEvent, this, std::placeholders::_1,
-						     std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
-
-	eventHandler->SetObsReadyCallback(std::bind(&WebSocketServer::onObsReady, this, std::placeholders::_1));
+	if (eventHandler) {
+		eventHandler->SetBroadcastCallback(std::bind(&WebSocketServer::BroadcastEvent, this, std::placeholders::_1,
+							     std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
+		eventHandler->SetObsReadyCallback(std::bind(&WebSocketServer::onObsReady, this, std::placeholders::_1));
+	}
 }
 
 WebSocketServer::~WebSocketServer()
 {
+	auto eventHandler = GetEventHandler();
+	if (eventHandler) {
+		eventHandler->SetObsReadyCallback(nullptr);
+		eventHandler->SetBroadcastCallback(nullptr);
+	}
+
 	if (_server.is_listening())
 		Stop();
 }