summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Paalanen <ppaalanen@gmail.com>2013-02-20 13:39:17 +0200
committerKristian Høgsberg <krh@bitplanet.net>2013-02-20 14:13:41 -0500
commit6f41b0727cb6c61fd487ecee43098adb03ac12da (patch)
tree29d384ff2b31cb92fe8480e79a93b1fc2912551c
parent7cc3d846f42da60bb9a5232e0afc5afea435e7f5 (diff)
window: fix display_acquire_window_surface()
Make sure that display_acquire_window_surface() creates the Cairo surface as necessary. Otherwise surface->toysurface can be NULL. This fixes weston-screensaver fullscreen mode. Demo mode was not affected as it uses window decorations, and so the Cairo surface is created. This regression was introduced by: commit 0c4445ba5756e51007606028bce00b2ecb352bd7 Author: Pekka Paalanen <ppaalanen@gmail.com> Date: Wed Feb 13 16:17:23 2013 +0200 window: create Cairo surfaces on demand for redraw Reported-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
-rw-r--r--clients/window.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/clients/window.c b/clients/window.c
index 1c5c285b..d9175505 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -4529,6 +4529,7 @@ display_acquire_window_surface(struct display *display,
if (surface->buffer_type != WINDOW_BUFFER_TYPE_EGL_WINDOW)
return -1;
+ widget_get_cairo_surface(window->main_surface->widget);
return surface->toysurface->acquire(surface->toysurface, ctx);
}