Skip to content

Commit 9330d5a

Browse files
committed
Merge pull request #107700 from bruvzg/macos_docgen
Fix `doctool` crash and errors on macOS.
2 parents 7168009 + ec37e7e commit 9330d5a

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

editor/export/editor_export_platform_apple_embedded.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2438,7 +2438,7 @@ void EditorExportPlatformAppleEmbedded::_check_for_changes_poll_thread(void *ud)
24382438

24392439
// Enum real devices (via ios_deploy, pre Xcode 15).
24402440
String ios_deploy_setting = "export/" + ea->get_platform_name() + "/ios_deploy";
2441-
if (EditorSettings::get_singleton()->has_setting(ios_deploy_setting)) {
2441+
if (EditorSettings::get_singleton() && EditorSettings::get_singleton()->has_setting(ios_deploy_setting)) {
24422442
String idepl = EDITOR_GET(ios_deploy_setting);
24432443
if (ea->has_runnable_preset.is_set() && !idepl.is_empty()) {
24442444
String devices_json;

editor/script_create_dialog.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,9 @@ void ScriptCreateDialog::_bind_methods() {
847847
}
848848

849849
ScriptCreateDialog::ScriptCreateDialog() {
850-
EDITOR_DEF("_script_setup_templates_dictionary", Dictionary());
850+
if (EditorSettings::get_singleton()) {
851+
EDITOR_DEF("_script_setup_templates_dictionary", Dictionary());
852+
}
851853

852854
/* Main Controls */
853855

0 commit comments

Comments
 (0)