projects
/
platform
/
upstream
/
weston.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21223bf
)
window: Avoid setting an invalid surface for the pointer
author
Rob Bradford
<rob@linux.intel.com>
Tue, 25 Oct 2011 11:20:51 +0000
(12:20 +0100)
committer
Rob Bradford
<rob@linux.intel.com>
Tue, 25 Oct 2011 11:20:51 +0000
(12:20 +0100)
If we failed to load the pointer image to the surface then do not create a
buffer from a NULL surface and do not attach that to the device.
clients/window.c
patch
|
blob
|
history
diff --git
a/clients/window.c
b/clients/window.c
index
e192ead
..
d75a0ac
100644
(file)
--- a/
clients/window.c
+++ b/
clients/window.c
@@
-1176,6
+1176,10
@@
set_pointer_image(struct input *input, uint32_t time, int pointer)
input->current_pointer_image = pointer;
surface = display->pointer_surfaces[pointer];
+
+ if (!surface)
+ return;
+
buffer = display_get_buffer_for_surface(display, surface);
wl_input_device_attach(input->input_device, time, buffer,
pointer_images[pointer].hotspot_x,