mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-27 09:16:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1761 from est31/master

Browse Source 
Fix headless exporting bugs
This commit is contained in:
Juan Linietsky 2015-05-16 13:43:38 -03:00
commit 744f778707
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/editor/editor_settings.cpp
View File

@ -264,6 +264,7 @@ void EditorSettings::create() {
singleton = Ref<EditorSettings>( memnew( EditorSettings ) );
singleton->config_file_path=config_file_path;
singleton->settings_path=config_path+"/"+config_dir;
singleton->_load_defaults();
singleton->scan_plugins();

5
tools/editor/project_export.cpp
View File

@ -479,6 +479,11 @@ Error ProjectExportDialog::export_platform(const String& p_platform, const Strin
if (err!=OK) {
error->set_text("Error exporting project!");
error->popup_centered_minsize();
ERR_PRINT("Exporting failed!");
if (p_quit_after) {
OS::get_singleton()->set_exit_code(255);
get_tree()->quit();
}
return ERR_CANT_CREATE;
} else {
if (p_quit_after) {