diff options
Diffstat (limited to 'sway/container.c')
-rw-r--r-- | sway/container.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sway/container.c b/sway/container.c index 231876c5..f10fbecf 100644 --- a/sway/container.c +++ b/sway/container.c | |||
@@ -54,9 +54,7 @@ swayc_t *new_output(wlc_handle handle) { | |||
54 | output->width = size->w; | 54 | output->width = size->w; |
55 | output->height = size->h; | 55 | output->height = size->h; |
56 | output->handle = handle; | 56 | output->handle = handle; |
57 | if (name) { | 57 | output->name = name ? strdup(name) : NULL; |
58 | output->name = strdup(name); | ||
59 | } | ||
60 | 58 | ||
61 | add_child(&root_container, output); | 59 | add_child(&root_container, output); |
62 | 60 | ||
@@ -95,7 +93,7 @@ swayc_t *new_container(swayc_t *child, enum swayc_layouts layout) { | |||
95 | cont->layout = layout; | 93 | cont->layout = layout; |
96 | cont->width = child->width; | 94 | cont->width = child->width; |
97 | cont->height = child->height; | 95 | cont->height = child->height; |
98 | cont->x = child->x; | 96 | cont->x = child->x; |
99 | cont->y = child->y; | 97 | cont->y = child->y; |
100 | cont->visible = child->visible; | 98 | cont->visible = child->visible; |
101 | 99 | ||
@@ -132,7 +130,7 @@ swayc_t *new_view(swayc_t *sibling, wlc_handle handle) { | |||
132 | (unsigned int)handle, title, sibling, sibling?sibling->type:0); | 130 | (unsigned int)handle, title, sibling, sibling?sibling->type:0); |
133 | //Setup values | 131 | //Setup values |
134 | view->handle = handle; | 132 | view->handle = handle; |
135 | view->name = strdup(title); | 133 | view->name = title ? strdup(title) : NULL; |
136 | view->visible = true; | 134 | view->visible = true; |
137 | 135 | ||
138 | view->desired_width = -1; | 136 | view->desired_width = -1; |
@@ -159,7 +157,7 @@ swayc_t *new_floating_view(wlc_handle handle) { | |||
159 | (unsigned int)handle, title); | 157 | (unsigned int)handle, title); |
160 | //Setup values | 158 | //Setup values |
161 | view->handle = handle; | 159 | view->handle = handle; |
162 | view->name = strdup(title); | 160 | view->name = title ? strdup(title) : NULL; |
163 | view->visible = true; | 161 | view->visible = true; |
164 | 162 | ||
165 | // Set the geometry of the floating view | 163 | // Set the geometry of the floating view |