Merge pull request #94116 from bruvzg/ed_quit_unload

[Editor] Unload addons when using `--import` or `--quit`.

1 files changed, 12 insertions, 0 deletions

diff --git a/main/main.cpp b/main/main.cpp
index 86abf94c0a..870f7d31b8 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -4170,7 +4170,13 @@ bool Main::iteration() {
 		movie_writer->add_frame();
 	}
 
+#ifdef TOOLS_ENABLED
+	bool quit_after_timeout = false;
+#endif
 	if ((quit_after > 0) && (Engine::get_singleton()->_process_frames >= quit_after)) {
+#ifdef TOOLS_ENABLED
+		quit_after_timeout = true;
+#endif
 		exit = true;
 	}
 
@@ -4203,6 +4209,12 @@ bool Main::iteration() {
 	}
 #endif
 
+#ifdef TOOLS_ENABLED
+	if (exit && quit_after_timeout && EditorNode::get_singleton()) {
+		EditorNode::get_singleton()->unload_editor_addons();
+	}
+#endif
+
 	return exit;
 }