Skip to content

Commit

Permalink
Merge branch 'next' into stable/10
Browse files Browse the repository at this point in the history
  • Loading branch information
yshui committed Nov 22, 2022
2 parents c678ad6 + a9db7ab commit 15673c3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/picom.c
Original file line number Diff line number Diff line change
Expand Up @@ -539,8 +539,8 @@ static bool initialize_backend(session_t *ps) {
} else {
shader->attributes = 0;
}
log_debug("Shader %s has attributes %ld", shader->key,
shader->attributes);
log_debug("Shader %s has attributes %" PRIu64,
shader->key, shader->attributes);
}
}

Expand Down
1 change: 1 addition & 0 deletions src/win.c
Original file line number Diff line number Diff line change
Expand Up @@ -2140,6 +2140,7 @@ static void destroy_win_finish(session_t *ps, struct win *w) {
assert(mw->shadow_image != NULL);
win_release_shadow(ps->backend_data, mw);
}
win_release_mask(ps->backend_data, mw);

// Invalidate reg_ignore of windows below this one
// TODO(yshui) what if next_w is not mapped??
Expand Down

0 comments on commit 15673c3

Please sign in to comment.