diff options
Diffstat (limited to 'sway/tree/container.c')
-rw-r--r-- | sway/tree/container.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 45e54080..eb06edc2 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -108,7 +108,6 @@ struct sway_container *container_create(enum sway_container_type type) { | |||
108 | c->layout = L_NONE; | 108 | c->layout = L_NONE; |
109 | c->type = type; | 109 | c->type = type; |
110 | c->alpha = 1.0f; | 110 | c->alpha = 1.0f; |
111 | c->instructions = create_list(); | ||
112 | 111 | ||
113 | if (type != C_VIEW) { | 112 | if (type != C_VIEW) { |
114 | c->children = create_list(); | 113 | c->children = create_list(); |
@@ -140,8 +139,8 @@ void container_free(struct sway_container *cont) { | |||
140 | "Tried to free container which wasn't marked as destroying")) { | 139 | "Tried to free container which wasn't marked as destroying")) { |
141 | return; | 140 | return; |
142 | } | 141 | } |
143 | if (!sway_assert(cont->instructions->length == 0, | 142 | if (!sway_assert(cont->ntxnrefs == 0, "Tried to free container " |
144 | "Tried to free container with pending instructions")) { | 143 | "which is still referenced by transactions")) { |
145 | return; | 144 | return; |
146 | } | 145 | } |
147 | free(cont->name); | 146 | free(cont->name); |
@@ -150,7 +149,6 @@ void container_free(struct sway_container *cont) { | |||
150 | wlr_texture_destroy(cont->title_focused_inactive); | 149 | wlr_texture_destroy(cont->title_focused_inactive); |
151 | wlr_texture_destroy(cont->title_unfocused); | 150 | wlr_texture_destroy(cont->title_unfocused); |
152 | wlr_texture_destroy(cont->title_urgent); | 151 | wlr_texture_destroy(cont->title_urgent); |
153 | list_free(cont->instructions); | ||
154 | list_free(cont->children); | 152 | list_free(cont->children); |
155 | list_free(cont->current.children); | 153 | list_free(cont->current.children); |
156 | 154 | ||