hyprwm/xdg-desktop-portal-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/xdg-desktop-portal-hyprland.git synced 2024-11-25 23:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

screencast: don't fail when copy_buffer was unsuccessfull

Browse source 
When a buffer is destroyed while used in the copy_buffer request the
screencopy protocoll will answer with the failed event. This can happen
anytime when PipeWire calls the remove_buffer callback, eg. on
renegotiation. This is not fatal, so we don't need to close the
screencast.

cast->err should only be used for fatal errors.
This commit is contained in:
columbarius 2021-11-04 01:58:44 +01:00
parent 35cba50409
commit cd30bd0f8e
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/screencast/wlr_screencast.c
View file

@ -69,6 +69,12 @@ void xdpw_wlr_frame_finish(struct xdpw_screencast_instance *cast) {
void xdpw_wlr_frame_start(struct xdpw_screencast_instance *cast) { void xdpw_wlr_frame_start(struct xdpw_screencast_instance *cast) {
logprint(TRACE, "wlroots: start screencopy"); logprint(TRACE, "wlroots: start screencopy");
if (cast->err) {
logprint(ERROR, "wlroots: nonrecoverable error has happened. shutting down instance");
xdpw_screencast_instance_destroy(cast);
return ;
}
if (cast->pwr_stream_state) { if (cast->pwr_stream_state) {
xdpw_pwr_dequeue_buffer(cast); xdpw_pwr_dequeue_buffer(cast);
@ -195,7 +201,6 @@ static void wlr_frame_failed(void *data,
struct xdpw_screencast_instance *cast = data; struct xdpw_screencast_instance *cast = data;
logprint(TRACE, "wlroots: failed event handler"); logprint(TRACE, "wlroots: failed event handler");
cast->err = true;
cast->frame_state = XDPW_FRAME_STATE_FAILED; cast->frame_state = XDPW_FRAME_STATE_FAILED;