gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-07-20 18:10:40 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #89378 from Faolan-Rad/FixBugWithDIableingGodotModuleInEditor

Browse source 
Fix PluginConfigDialog crash in editor build without any language support
This commit is contained in:
Rémi Verschelde 2024-03-11 14:02:50 +01:00
parent 51c3f6a534 1836f5c7a4
commit 6cfed9734e
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
editor/plugin_config_dialog.cpp
View file

@ -60,7 +60,11 @@ void PluginConfigDialog::_on_confirmed() {
}
int lang_idx = script_option_edit->get_selected();
String ext = ScriptServer::get_language(lang_idx)->get_extension();
ScriptLanguage *language = ScriptServer::get_language(lang_idx);
if (language == nullptr) {
return;
}
String ext = language->get_extension();
String script_name = script_edit->get_text().is_empty() ? _get_subfolder() : script_edit->get_text();
if (script_name.get_extension() != ext) {
script_name += "." + ext;
@ -79,11 +83,11 @@ void PluginConfigDialog::_on_confirmed() {
if (!_edit_mode) {
String class_name = script_name.get_basename();
String template_content = "";
Vector<ScriptLanguage::ScriptTemplate> templates = ScriptServer::get_language(lang_idx)->get_built_in_templates("EditorPlugin");
Vector<ScriptLanguage::ScriptTemplate> templates = language->get_built_in_templates("EditorPlugin");
if (!templates.is_empty()) {
template_content = templates[0].content;
}
Ref<Script> scr = ScriptServer::get_language(lang_idx)->make_template(template_content, class_name, "EditorPlugin");
Ref<Script> scr = language->make_template(template_content, class_name, "EditorPlugin");
scr->set_path(script_path, true);
ResourceSaver::save(scr);
@ -101,6 +105,9 @@ void PluginConfigDialog::_on_canceled() {
void PluginConfigDialog::_on_required_text_changed() {
int lang_idx = script_option_edit->get_selected();
ScriptLanguage *language = ScriptServer::get_language(lang_idx);
if (language == nullptr) {
return;
}
String ext = language->get_extension();
if (name_edit->get_text().is_empty()) {