griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: assert that mime type overrides are exist on Wayland

Browse Source 
Ensure the API is used as intended.
This commit is contained in:
Campbell Barton
2024-10-29 23:06:31 +11:00
parent 70657e7638
commit 70ccc74628
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/ghost/intern/GHOST_SystemWayland.cc
View File

@@ -7763,6 +7763,10 @@ static char *system_clipboard_get_primary_selection(GWL_Display *display,
const char *mime_receive = mime_receive_override ?
mime_receive_override :
system_clipboard_text_mime_type(data_offer->types);
GHOST_ASSERT((mime_receive_override == nullptr) ||
data_offer->types.count(mime_receive_override) != 0,
"Mime type override not found in data offer, caller must check");
if (mime_receive) {
/* Receive the clipboard in a thread, performing round-trips while waiting.
* This is needed so pasting contents from our own `primary->data_source` doesn't hang. */
@@ -7820,6 +7824,10 @@ static char *system_clipboard_get(GWL_Display *display,
const char *mime_receive = mime_receive_override ?
mime_receive_override :
system_clipboard_text_mime_type(data_offer->types);
GHOST_ASSERT((mime_receive_override == nullptr) ||
data_offer->types.count(mime_receive_override) != 0,
"Mime type override not found in data offer, caller must check");
if (mime_receive) {
/* Receive the clipboard in a thread, performing round-trips while waiting.
* This is needed so pasting contents from our own `seat->data_source` doesn't hang. */