From 8e4f8c82c5537da607756eea66a86057151f9078 Mon Sep 17 00:00:00 2001
From: smix8 <52464204+smix8@users.noreply.github.com>
Date: Tue, 20 Dec 2022 11:16:47 +0100
Subject: [PATCH] [3.x] Move navigation server finalize before physics server

Moves finalize_navigation_server() before physics server (and also OS in 3.x). The NavigationServer command queue can have objects from other servers like physics or visuals so it needs to be flushed before.
---
 main/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/main.cpp b/main/main.cpp
index da03dbe713f..040ddfc712a 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -2530,9 +2530,9 @@ void Main::cleanup(bool p_force) {
 		memdelete(camera_server);
 	}
 
+	finalize_navigation_server();
 	OS::get_singleton()->finalize();
 	finalize_physics();
-	finalize_navigation_server();
 
 	if (packed_data) {
 		memdelete(packed_data);