Merge pull request #73239 from bruvzg/cleanup_callback

Cleanup Window callbacks before destroying in to avoid callback calls with invalid object.
godotengine · Feb 13, 2023 · 854d9c3 · 854d9c3
2 parents 3815903 + a000c64
commit 854d9c3
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/scene/main/window.cpp b/scene/main/window.cpp
@@ -569,6 +569,12 @@ void Window::_update_from_window() {
 void Window::_clear_window() {
 	ERR_FAIL_COND(window_id == DisplayServer::INVALID_WINDOW_ID);
 
+	DisplayServer::get_singleton()->window_set_rect_changed_callback(Callable(), window_id);
+	DisplayServer::get_singleton()->window_set_window_event_callback(Callable(), window_id);
+	DisplayServer::get_singleton()->window_set_input_event_callback(Callable(), window_id);
+	DisplayServer::get_singleton()->window_set_input_text_callback(Callable(), window_id);
+	DisplayServer::get_singleton()->window_set_drop_files_callback(Callable(), window_id);
+
 	if (transient_parent && transient_parent->window_id != DisplayServer::INVALID_WINDOW_ID) {
 		DisplayServer::get_singleton()->window_set_transient(window_id, DisplayServer::INVALID_WINDOW_ID);
 	}