Merge pull request #4310 from arnaud-ma/remove-persistent-workspace-rules
Fix #4307
This commit is contained in:
commit
e526afb963
|
|
@ -294,8 +294,13 @@ void Workspaces::loadPersistentWorkspacesFromWorkspaceRules(const Json::Value &c
|
||||||
if (!rule["persistent"].asBool()) {
|
if (!rule["persistent"].asBool()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
auto const &workspace = rule.isMember("defaultName") ? rule["defaultName"].asString()
|
auto workspace = rule.isMember("defaultName") ? rule["defaultName"].asString()
|
||||||
: rule["workspaceString"].asString();
|
: rule["workspaceString"].asString();
|
||||||
|
|
||||||
|
// The prefix "name:" cause mismatches with workspace names taken anywhere else.
|
||||||
|
if (workspace.starts_with("name:")) {
|
||||||
|
workspace = workspace.substr(5);
|
||||||
|
}
|
||||||
auto const &monitor = rule["monitor"].asString();
|
auto const &monitor = rule["monitor"].asString();
|
||||||
// create this workspace persistently if:
|
// create this workspace persistently if:
|
||||||
// 1. the allOutputs config option is enabled
|
// 1. the allOutputs config option is enabled
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue