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:
8bd35c7
)
compositor: Don't try and use a NULL sprite for the device pointer
author
Rob Bradford
<rob@linux.intel.com>
Tue, 25 Oct 2011 12:38:31 +0000
(13:38 +0100)
committer
Rob Bradford
<rob@linux.intel.com>
Tue, 25 Oct 2011 12:38:31 +0000
(13:38 +0100)
If loading the pointer images to the sprites fails then do not try and use
those NULL sprites for the pointer.
compositor/compositor.c
patch
|
blob
|
history
diff --git
a/compositor/compositor.c
b/compositor/compositor.c
index
5690efe
..
e0d7b32
100644
(file)
--- a/
compositor/compositor.c
+++ b/
compositor/compositor.c
@@
-1160,6
+1160,9
@@
static void
wlsc_input_device_attach_sprite(struct wlsc_input_device *device,
struct wlsc_sprite *sprite, int x, int y)
{
+ if (!sprite)
+ return;
+
wlsc_sprite_attach(sprite, &device->sprite->surface);
wlsc_input_device_attach(device, x, y, sprite->width, sprite->height);
}