mirror of
https://github.com/swaywm/sway.git
synced 2024-11-24 08:51:27 +00:00
workspace_create: Don't allow NULL name
(cherry picked from commit 34933bb843
)
This commit is contained in:
parent
0143c7ade8
commit
5a2563b1a4
|
@ -56,6 +56,8 @@ struct sway_output *workspace_get_initial_output(const char *name) {
|
||||||
|
|
||||||
struct sway_workspace *workspace_create(struct sway_output *output,
|
struct sway_workspace *workspace_create(struct sway_output *output,
|
||||||
const char *name) {
|
const char *name) {
|
||||||
|
sway_assert(name, "NULL name given to workspace_create");
|
||||||
|
|
||||||
if (output == NULL) {
|
if (output == NULL) {
|
||||||
output = workspace_get_initial_output(name);
|
output = workspace_get_initial_output(name);
|
||||||
}
|
}
|
||||||
|
@ -69,7 +71,7 @@ struct sway_workspace *workspace_create(struct sway_output *output,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
node_init(&ws->node, N_WORKSPACE, ws);
|
node_init(&ws->node, N_WORKSPACE, ws);
|
||||||
ws->name = name ? strdup(name) : NULL;
|
ws->name = strdup(name);
|
||||||
ws->prev_split_layout = L_NONE;
|
ws->prev_split_layout = L_NONE;
|
||||||
ws->layout = output_get_default_layout(output);
|
ws->layout = output_get_default_layout(output);
|
||||||
ws->floating = create_list();
|
ws->floating = create_list();
|
||||||
|
|
Loading…
Reference in a new issue