godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94116 from bruvzg/ed_quit_unload 

[Editor] Unload addons when using `--import` or `--quit`.
This commit is contained in:
Rémi Verschelde 2024-07-19 11:10:37 +02:00
parent 18da250ffb c151c7dce0
commit f649112dfc
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/editor_node.cpp
View File

@ -3340,13 +3340,17 @@ void EditorNode::_exit_editor(int p_exit_code) {
dim_editor(true); dim_editor(true);
// Unload addons before quitting to allow cleanup. // Unload addons before quitting to allow cleanup.
unload_editor_addons();
get_tree()->quit(p_exit_code);
}
void EditorNode::unload_editor_addons() {
for (const KeyValue<String, EditorPlugin *> &E : addon_name_to_plugin) { for (const KeyValue<String, EditorPlugin *> &E : addon_name_to_plugin) {
print_verbose(vformat("Unloading addon: %s", E.key)); print_verbose(vformat("Unloading addon: %s", E.key));
remove_editor_plugin(E.value, false); remove_editor_plugin(E.value, false);
memdelete(E.value); memdelete(E.value);
} }
get_tree()->quit(p_exit_code);
} }
void EditorNode::_discard_changes(const String &p_str) { void EditorNode::_discard_changes(const String &p_str) {

1
editor/editor_node.h
View File

@ -908,6 +908,7 @@ public:
void save_before_run(); void save_before_run();
void try_autosave(); void try_autosave();
void restart_editor(); void restart_editor();
void unload_editor_addons();
void dim_editor(bool p_dimming); void dim_editor(bool p_dimming);
bool is_editor_dimmed() const; bool is_editor_dimmed() const;

12
main/main.cpp
View File

@ -4170,7 +4170,13 @@ bool Main::iteration() {
movie_writer->add_frame(); movie_writer->add_frame();
} }
#ifdef TOOLS_ENABLED
bool quit_after_timeout = false;
#endif
if ((quit_after > 0) && (Engine::get_singleton()->_process_frames >= quit_after)) { if ((quit_after > 0) && (Engine::get_singleton()->_process_frames >= quit_after)) {
#ifdef TOOLS_ENABLED
quit_after_timeout = true;
#endif
exit = true; exit = true;
} }
@ -4203,6 +4209,12 @@ bool Main::iteration() {
} }
#endif #endif
#ifdef TOOLS_ENABLED
if (exit && quit_after_timeout && EditorNode::get_singleton()) {
EditorNode::get_singleton()->unload_editor_addons();
}
#endif
return exit; return exit;
} }