diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-05-16 17:13:25 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-05-16 17:13:25 -0300 |
| commit | 8482611f8163506aba02a4556715cebbd922cf77 (patch) | |
| tree | ee5340541518ed3c654958502c4fd6835c57391a /tools/editor | |
| parent | 1e382dbb1835d0509630ee9e6a61501e3839239b (diff) | |
| parent | 219dcaaa758af87c06ba8903cc984366da871912 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools/editor')
| -rw-r--r-- | tools/editor/editor_help.cpp | 2 | ||||
| -rw-r--r-- | tools/editor/editor_settings.cpp | 1 | ||||
| -rw-r--r-- | tools/editor/project_export.cpp | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/tools/editor/editor_help.cpp b/tools/editor/editor_help.cpp index a5b6fbd4ff..25fc526bf9 100644 --- a/tools/editor/editor_help.cpp +++ b/tools/editor/editor_help.cpp @@ -353,7 +353,7 @@ void EditorHelp::_search(const String&) { String stext=search->get_text(); bool keep = prev_search==stext && class_list->get_selected() && prev_search_page==class_list->get_selected()->get_text(0); - class_desc->search(stext); + class_desc->search(stext, keep); prev_search=stext; if (class_list->get_selected()) 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) { |