From b0a92562dc7ef7dee4628cd80568e98a8ce2e348 Mon Sep 17 00:00:00 2001 From: John Knight <80524176+Tekisasu-JohnK@users.noreply.github.com> Date: Sun, 13 Oct 2024 01:37:17 -0700 Subject: [PATCH 1/2] Branding - update scheduled task name on Windows SSH remote deploy This resolves an issue where the ScheduledTask created by a Blazium master for a remote target machine still uses upstream project name. --- platform/windows/export/export_plugin.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/platform/windows/export/export_plugin.cpp b/platform/windows/export/export_plugin.cpp index 12694b0155dd..ef81db27d482 100644 --- a/platform/windows/export/export_plugin.cpp +++ b/platform/windows/export/export_plugin.cpp @@ -433,13 +433,13 @@ void EditorExportPlatformWindows::get_export_options(List *r_optio "$trigger = New-ScheduledTaskTrigger -Once -At 00:00\n" "$settings = New-ScheduledTaskSettingsSet\n" "$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings\n" - "Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true\n" - "Start-ScheduledTask -TaskName godot_remote_debug\n" - "while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }\n" - "Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"; + "Register-ScheduledTask blazium_remote_debug -InputObject $task -Force:$true\n" + "Start-ScheduledTask -TaskName blazium_remote_debug\n" + "while (Get-ScheduledTask -TaskName blazium_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }\n" + "Unregister-ScheduledTask -TaskName blazium_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"; - String cleanup_script = "Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue\n" - "Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue\n" + String cleanup_script = "Stop-ScheduledTask -TaskName blazium_remote_debug -ErrorAction:SilentlyContinue\n" + "Unregister-ScheduledTask -TaskName blazium_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue\n" "Remove-Item -Recurse -Force '{temp_dir}'"; r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "ssh_remote_deploy/enabled"), false, true)); From eb753632edcab223fc888833af1c68239923a0f1 Mon Sep 17 00:00:00 2001 From: John Knight <80524176+Tekisasu-JohnK@users.noreply.github.com> Date: Wed, 16 Oct 2024 00:04:35 -0500 Subject: [PATCH 2/2] Update display_server_x11.cpp Added comment on location of non main window titlebar naming instructions. --- platform/linuxbsd/x11/display_server_x11.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp index b6657ed024d6..af4e3de71791 100644 --- a/platform/linuxbsd/x11/display_server_x11.cpp +++ b/platform/linuxbsd/x11/display_server_x11.cpp @@ -5638,7 +5638,7 @@ DisplayServerX11::WindowID DisplayServerX11::_create_window(WindowMode p_mode, V } /* set the titlebar name */ - XStoreName(x11_display, wd.x11_window, "Blazium"); + XStoreName(x11_display, wd.x11_window, "Blazium"); // Child windows are named in void DisplayServerX11::_update_context() -Teki XSetWMProtocols(x11_display, wd.x11_window, &wm_delete, 1); if (xdnd_aware != None) { XChangeProperty(x11_display, wd.x11_window, xdnd_aware, XA_ATOM, 32, PropModeReplace, (unsigned char *)&xdnd_version, 1);