From d6b6d6668e84b9f3d61d509b0cb663011c759732 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] 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 d2f2fda68..f8b806d97 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -2450,9 +2450,9 @@ void Main::cleanup(bool p_force) {
 		memdelete(audio_server);
 	}
 
+	finalize_navigation_server();
 	OS::get_singleton()->finalize();
 	finalize_physics();
-	finalize_navigation_server();
 
 	if (packed_data) {
 		memdelete(packed_data);