blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

GHOST/Wayland: unlock clipboard mutex on failure 

When the Wayland pipe can't be opened, don't leave the mutex locked.
Also skip checking wl_data_device_manager when reading from the primary
clipboard.
This commit is contained in:
Campbell Barton 2022-10-28 09:29:00 +11:00
parent 454dd3f7f0
commit b544d989d1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
intern/ghost/intern/GHOST_SystemWayland.cpp
View File

@ -1681,6 +1681,9 @@ static const char *read_buffer_from_data_offer(GWL_DataOffer *data_offer,
int pipefd[2];
if (UNLIKELY(pipe(pipefd) != 0)) {
CLOG_WARN(LOG, "error creating pipe: %s", std::strerror(errno));
if (mutex) {
mutex->unlock();
}
return nullptr;
}
wl_data_offer_receive(data_offer->id, mime_receive, pipefd[1]);
@ -1707,6 +1710,9 @@ static const char *read_buffer_from_primary_selection_offer(
int pipefd[2];
if (UNLIKELY(pipe(pipefd) != 0)) {
CLOG_WARN(LOG, "error creating pipe: %s", std::strerror(errno));
if (mutex) {
mutex->unlock();
}
return nullptr;
}
zwp_primary_selection_offer_v1_receive(data_offer->id, mime_receive, pipefd[1]);
@ -5114,6 +5120,9 @@ static void system_clipboard_put_primary_selection(GWL_Display *display, const c
static void system_clipboard_put(GWL_Display *display, const char *buffer)
{
if (!display->wl_data_device_manager) {
return;
}
GWL_Seat *seat = display->seats[0];
std::lock_guard lock{seat->data_source_mutex};
@ -5140,7 +5149,7 @@ static void system_clipboard_put(GWL_Display *display, const char *buffer)
void GHOST_SystemWayland::putClipboard(const char *buffer, bool selection) const
{
if (UNLIKELY(!display_->wl_data_device_manager || display_->seats.empty())) {
if (UNLIKELY(display_->seats.empty())) {
return;
}