diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-16 13:43:38 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-16 13:43:38 -0300 |
| commit | 744f778707ba97173a4712ba6bf78c5ab5d81f11 (patch) | |
| tree | f3b35ba174cc54255e50b92d00324d51534bca2f | |
| parent | 3a1d8375f704333ea73ea38d85fc2d87a57eedd0 (diff) | |
| parent | 584f4470c8be53fa2c682fdd9caede949fc58cf0 (diff) | |
Merge pull request #1761 from est31/master
Fix headless exporting bugs
| -rw-r--r-- | tools/editor/editor_settings.cpp | 1 | ||||
| -rw-r--r-- | tools/editor/project_export.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index 9a4505efed..f49d3b496d 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -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(); diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp index 63187d2903..374dda852b 100644 --- a/tools/editor/project_export.cpp +++ b/tools/editor/project_export.cpp @@ -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) { |