浏览代码

Merge pull request #107700 from bruvzg/macos_docgen

Fix `doctool` crash and errors on macOS.
Thaddeus Crews 2 月之前
父节点
当前提交
9330d5a32a
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 1 1
      editor/export/editor_export_platform_apple_embedded.cpp
  2. 3 1
      editor/script_create_dialog.cpp

+ 1 - 1
editor/export/editor_export_platform_apple_embedded.cpp

@@ -2438,7 +2438,7 @@ void EditorExportPlatformAppleEmbedded::_check_for_changes_poll_thread(void *ud)
 
 		// Enum real devices (via ios_deploy, pre Xcode 15).
 		String ios_deploy_setting = "export/" + ea->get_platform_name() + "/ios_deploy";
-		if (EditorSettings::get_singleton()->has_setting(ios_deploy_setting)) {
+		if (EditorSettings::get_singleton() && EditorSettings::get_singleton()->has_setting(ios_deploy_setting)) {
 			String idepl = EDITOR_GET(ios_deploy_setting);
 			if (ea->has_runnable_preset.is_set() && !idepl.is_empty()) {
 				String devices_json;

+ 3 - 1
editor/script_create_dialog.cpp

@@ -847,7 +847,9 @@ void ScriptCreateDialog::_bind_methods() {
 }
 
 ScriptCreateDialog::ScriptCreateDialog() {
-	EDITOR_DEF("_script_setup_templates_dictionary", Dictionary());
+	if (EditorSettings::get_singleton()) {
+		EDITOR_DEF("_script_setup_templates_dictionary", Dictionary());
+	}
 
 	/* Main Controls */