From 1268e65aa5a804a249c9da5d0e32e4b2c90d1f0c Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 29 Apr 2015 01:36:46 +0200 Subject: Set settings directory variable when loading settings fails This makes export work when you are first running godot for your user. --- tools/editor/editor_settings.cpp | 1 + 1 file changed, 1 insertion(+) 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( memnew( EditorSettings ) ); singleton->config_file_path=config_file_path; + singleton->settings_path=config_path+"/"+config_dir; singleton->_load_defaults(); singleton->scan_plugins(); -- cgit v1.2.3 From 584f4470c8be53fa2c682fdd9caede949fc58cf0 Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 29 Apr 2015 02:50:05 +0200 Subject: Abort when exporting fails --- tools/editor/project_export.cpp | 5 +++++ 1 file changed, 5 insertions(+) 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) { -- cgit v1.2.3