From 5706fe435a4d0a1b7783207f05208c24a58e2300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 20 Mar 2025 13:20:32 +0100 Subject: [PATCH] Manager: fix issue in first-time setup wizard causing empty `blender` var Fix an issue in the First-Time Setup wizard, which caused an empty `blender` variable when using the system-default location for Blender. Fixes #104366 --- CHANGELOG.md | 1 + internal/manager/api_impl/meta.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f0fc525..e79a4d93 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ bugs in actually-released versions. This happens uniformly, regardless of the platform. So also on Linux, which has a case-sensitive filesystem, this matching is done in a case-insensitive way. It is very unlikely that a Flamenco configuration has two separate variables, for paths that only differ in their case. - Fix issue where jobs could get stuck in `pause-requested` state. Such jobs are now also detected at startup of the Manager, and sent to `paused` when possible. - Log a warning at startup when the `blender` variable is missing, or has no value for one or more platforms. +- Fix an issue in the First Time Setup wizard, where the "System Default Location for Blender" could cause the `blender` variable to be empty, and thus the farm inoperable. ## 3.6 - released 2024-12-01 diff --git a/internal/manager/api_impl/meta.go b/internal/manager/api_impl/meta.go index 5a4e44e1..b9e03a24 100644 --- a/internal/manager/api_impl/meta.go +++ b/internal/manager/api_impl/meta.go @@ -291,7 +291,7 @@ func (f *Flamenco) SaveSetupAssistantConfig(e echo.Context) error { // The input command can be found on $PATH, and thus we don't need to save // the absolute path to Blender here. executable = setupAssistantCfg.BlenderExecutable.Input - case api.BlenderPathSourceInputPath: + case api.BlenderPathSourceInputPath, api.BlenderPathSourceSystemLocation: // The path should be used as-is. executable = setupAssistantCfg.BlenderExecutable.Path }