diff options
author | 2018-06-18 15:58:48 +1000 | |
---|---|---|
committer | 2018-06-18 15:58:48 +1000 | |
commit | 645bf446fab8db581b04babb1a34aa3c40428058 (patch) | |
tree | 4b7374d58e0b6a5b183049bc7551db8016f8a296 /client | |
parent | Merge remote-tracking branch 'upstream/master' into atomic (diff) | |
parent | Merge pull request #2143 from vilhalmer/mark-pool-buffers-busy (diff) | |
download | sway-645bf446fab8db581b04babb1a34aa3c40428058.tar.gz sway-645bf446fab8db581b04babb1a34aa3c40428058.tar.zst sway-645bf446fab8db581b04babb1a34aa3c40428058.zip |
Merge remote-tracking branch 'upstream/master' into atomic
Diffstat (limited to 'client')
-rw-r--r-- | client/pool-buffer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/pool-buffer.c b/client/pool-buffer.c index 52438303..fa468c0d 100644 --- a/client/pool-buffer.c +++ b/client/pool-buffer.c | |||
@@ -144,5 +144,6 @@ struct pool_buffer *get_next_buffer(struct wl_shm *shm, | |||
144 | return NULL; | 144 | return NULL; |
145 | } | 145 | } |
146 | } | 146 | } |
147 | buffer->busy = true; | ||
147 | return buffer; | 148 | return buffer; |
148 | } | 149 | } |