Module: wine Branch: stable Commit: cf4c982d5f00781b51dbcf39dd34a576cafe9f70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf4c982d5f00781b51dbcf39d...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Aug 25 08:08:13 2017 +0200
winex11: If importing an X11 clipboard format fails, try other candidate formats for the target.
Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit 401ccc73e204522278d1d0426af008a1b89c8bd9) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/winex11.drv/clipboard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 4cb8cb8..4668ce8 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1082,8 +1082,9 @@ static HANDLE render_format( UINT id ) for (i = 0; i < nb_current_x11_formats; i++) { if (current_x11_formats[i]->id != id) continue; - handle = import_selection( display, import_window, current_selection, current_x11_formats[i] ); - if (handle) SetClipboardData( id, handle ); + if (!(handle = import_selection( display, import_window, + current_selection, current_x11_formats[i] ))) continue; + SetClipboardData( id, handle ); break; } return handle;