diff options
| author | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2018-05-04 11:10:01 -0400 |
|---|---|---|
| committer | Alex Xu (Hello71) <alex_y_xu@yahoo.ca> | 2018-05-04 11:10:01 -0400 |
| commit | 3202c45054efd8e1d67b3aa48f5a46fc25a7bb57 (patch) | |
| tree | d5a9edbf868a0942b6a98582bdeffdbe90abd794 /sway/tree | |
| parent | 029c9b179664428db9940fe68632bbf19c3d5018 (diff) | |
| download | sway-3202c45054efd8e1d67b3aa48f5a46fc25a7bb57.tar.xz | |
Check for NULL in container_update_title
Fixes crash when opening Firefox developer tools.
Diffstat (limited to 'sway/tree')
| -rw-r--r-- | sway/tree/container.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 3ec58a5d..3746ad81 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -348,7 +348,7 @@ struct sway_container *container_view_create(struct sway_container *sibling, swayc, title, sibling, sibling ? sibling->type : 0, sibling->name); // Setup values swayc->sway_view = sway_view; - container_update_title(swayc, title ? title : ""); + container_update_title(swayc, title); swayc->width = 0; swayc->height = 0; @@ -660,9 +660,14 @@ static void container_notify_child_title_changed( void container_update_title(struct sway_container *container, const char *new_title) { + if (!new_title) { + new_title = ""; + } + if (container->name && strcmp(container->name, new_title) == 0) { return; } + if (container->name) { free(container->name); } |