summaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-07-30 14:54:08 -0400
committerLibravatar GitHub <noreply@github.com>2018-07-30 14:54:08 -0400
commitf19add2702f1215bf58aa8790bf3f46e50800e57 (patch)
tree72d6787e87fa238847bf24dadec102cd7a35d722 /sway
parentMerge pull request #2367 from emersion/iterator-redesign (diff)
parentFix segfault with fullscreen (diff)
downloadsway-f19add2702f1215bf58aa8790bf3f46e50800e57.tar.gz
sway-f19add2702f1215bf58aa8790bf3f46e50800e57.tar.zst
sway-f19add2702f1215bf58aa8790bf3f46e50800e57.zip
Merge pull request #2390 from emersion/fix-fullscreen-segfault
Fix segfault with fullscreen
Diffstat (limited to 'sway')
-rw-r--r--sway/desktop/output.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index 6b2eb0c2..31b53213 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -317,8 +317,9 @@ static void send_frame_done(struct sway_output *output, struct timespec *when) {
317 struct sway_container *workspace = output_get_active_workspace(output); 317 struct sway_container *workspace = output_get_active_workspace(output);
318 if (workspace->current.ws_fullscreen) { 318 if (workspace->current.ws_fullscreen) {
319 if (workspace->current.ws_fullscreen->type == C_VIEW) { 319 if (workspace->current.ws_fullscreen->type == C_VIEW) {
320 send_frame_done_container_iterator( 320 output_view_for_each_surface(output,
321 workspace->current.ws_fullscreen, when); 321 workspace->current.ws_fullscreen->sway_view,
322 send_frame_done_iterator, when);
322 } else { 323 } else {
323 send_frame_done_container(output, workspace->current.ws_fullscreen, 324 send_frame_done_container(output, workspace->current.ws_fullscreen,
324 when); 325 when);