diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-09-29 17:48:28 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-09-29 17:48:28 +0200 |
| commit | e5474684d5ae7c2c12bc2937defdb8380af1c633 (patch) | |
| tree | 76a2c55b1d756af586fe438d1c1e3de0db4ccede /client | |
| parent | 92d286c6b51f6ef363d35e3482792fddc8c3af7d (diff) | |
| download | spice-e5474684d5ae7c2c12bc2937defdb8380af1c633.tar.gz spice-e5474684d5ae7c2c12bc2937defdb8380af1c633.tar.xz spice-e5474684d5ae7c2c12bc2937defdb8380af1c633.zip | |
client: Avoid crash if platform_win is NULL
This is a temporary fix as this will be fixed for real when
the cut and paste patches land.
Diffstat (limited to 'client')
| -rw-r--r-- | client/x11/platform.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp index 11334148..ca5f1d57 100644 --- a/client/x11/platform.cpp +++ b/client/x11/platform.cpp @@ -3024,8 +3024,12 @@ void Platform::set_clipboard_listener(ClipboardListener* listener) return; } clipboard_listener = listener; - XConvertSelection(x_display, XA_PRIMARY, utf8_atom, clipboard_prop, - platform_win, CurrentTime); + /* Seems platform_win can be NULL, we'll just ignore that for now. + This will be fixed when the rest of cut and paste lands */ + if (platform_win) { + XConvertSelection(x_display, XA_PRIMARY, utf8_atom, clipboard_prop, + platform_win, CurrentTime); + } } bool Platform::set_clipboard_data(uint32_t type, const uint8_t* data, int32_t size) |