Merge "Fix deadlocks."
This commit is contained in:
commit
023bc0a426
1 changed files with 3 additions and 3 deletions
|
@ -76,6 +76,7 @@ void framebuffer_service(int fd, void *cookie)
|
|||
exit(1);
|
||||
}
|
||||
|
||||
close(fds[1]);
|
||||
fd_screencap = fds[0];
|
||||
|
||||
/* read w, h & format */
|
||||
|
@ -173,10 +174,9 @@ void framebuffer_service(int fd, void *cookie)
|
|||
}
|
||||
|
||||
done:
|
||||
TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0));
|
||||
|
||||
close(fds[0]);
|
||||
close(fds[1]);
|
||||
|
||||
TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0));
|
||||
pipefail:
|
||||
close(fd);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue