1berry/godotengine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #103805 from rsubtil/fix-recovery_lock_on_import

Browse Source 
Fix recovery mode lock file not being cleared on import/export
This commit is contained in:
Thaddeus Crews 2025-04-09 18:12:03 -05:00
commit 807ce83f00
No known key found for this signature in database
GPG Key ID: 8C6E5FEB5FC03CCC
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/main.cpp
View File

@ -4904,6 +4904,12 @@ void Main::cleanup(bool p_force) {
ResourceSaver::remove_custom_savers(); ResourceSaver::remove_custom_savers();
PropertyListHelper::clear_base_helpers(); PropertyListHelper::clear_base_helpers();
// Remove the lock file if the engine exits successfully. Some automated processes such as
// --export/--import can bypass and/or finish faster than the existing check to remove the lock file.
if (OS::get_singleton()->get_exit_code() == EXIT_SUCCESS) {
OS::get_singleton()->remove_lock_file();
}
// Flush before uninitializing the scene, but delete the MessageQueue as late as possible. // Flush before uninitializing the scene, but delete the MessageQueue as late as possible.
message_queue->flush(); message_queue->flush();