Bläddra i källkod

websocket: Fix crash at exit when not running the editor

EditorDebuggerServer::register_protocol_handler must not be called before
editor initialization. Otherwise, if the editor is never initialized,
the added StringName will not be released until static destructors are
called (instead of being release during editor deinitialization).
Ignacio Etcheverry 5 år sedan
förälder
incheckning
18332a0094
1 ändrade filer med 8 tillägg och 1 borttagningar
  1. 8 1
      modules/websocket/register_types.cpp

+ 8 - 1
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
 }