Merge pull request #38772 from neikeq/issue-38729

websocket: Fix crash at exit when not running the editor

Merge pull request #38772 from neikeq/issue-38729
5b2c0c34 · Rémi Verschelde · GitHub · 6815bf42 · 18332a00 · 5b2c0c34
Unverified Commit 5b2c0c34 authored May 16, 2020 by Rémi Verschelde Committed by GitHub May 16, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

register_types.cpp modules/websocket/register_types.cpp +8 -1

No files found.
--- a/modules/websocket/register_types.cpp
+++ b/modules/websocket/register_types.cpp
@@ -42,9 +42,16 @@
 #endif
 #ifdef TOOLS_ENABLED
 #include "editor/debugger/editor_debugger_server.h"
+#include "editor/editor_node.h"
 #include "editor_debugger_server_websocket.h"
 #endif

+#ifdef TOOLS_ENABLED
+static void _editor_init_callback() {
+	EditorDebuggerServer::register_protocol_handler("ws://", EditorDebuggerServerWebSocket::create);
+}
+#endif
+
 void register_websocket_types() {
 #ifdef JAVASCRIPT_ENABLED
 	EMWSPeer::make_default();
@@ -62,7 +69,7 @@ void register_websocket_types() {
 	ClassDB::register_custom_instance_class<WebSocketPeer>();

 #ifdef TOOLS_ENABLED
-	EditorDebuggerServer::register_protocol_handler("ws://", EditorDebuggerServerWebSocket::create);
+	EditorNode::add_init_callback(&_editor_init_callback);
 #endif
 }