Merge pull request #83 from jss2a98aj/cherry-pick-tekisasu-rebranding

Cherry pick usable commits from #15 and #20
blazium-engine · Oct 21, 2024 · 85cf1b0 · 85cf1b0
2 parents aba7c90 + eb75363
commit 85cf1b0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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);

diff --git a/platform/windows/export/export_plugin.cpp b/platform/windows/export/export_plugin.cpp
@@ -433,13 +433,13 @@ void EditorExportPlatformWindows::get_export_options(List<ExportOption> *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));