mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 00:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1912 from Hello71/patch-1

Browse source 
Check for NULL in container_update_title
This commit is contained in:
emersion 2018-05-04 16:21:38 +01:00 committed by GitHub
parent 029c9b1796 3202c45054
commit fbcbbb976c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sway/tree/container.c
View file

@ -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);
}