Merge branch 'primary-paste-check' into master

This commit is contained in:
Daniel Eklöf 2020-10-10 23:31:12 +02:00
commit abbdf48b14
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 3 additions and 2 deletions

View file

@ -76,6 +76,7 @@
* Crash after either resizing a window or changing the font size if
there were sixels present in the scrollback while doing so.
* _Send Device Attributes_ to only send a response if `Ps == 0`.
* Paste from primary when clipboard is empty.
### Security

View file

@ -1382,8 +1382,8 @@ selection_from_primary(struct seat *seat, struct terminal *term)
return;
}
struct wl_clipboard *clipboard = &seat->clipboard;
if (clipboard->data_offer == NULL)
struct wl_primary *primary = &seat->primary;
if (primary->data_offer == NULL)
return;
term->is_sending_paste_data = true;