Dynamically removing and inserting surfaces on outputs requires making
sure the surface is still mapped on that output.
Bug-AGL: SPEC-3280
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I125f9788718655ee88fa389fb14bd2c36342f8fe
void
remove_black_surface(struct ivi_output *output)
{
void
remove_black_surface(struct ivi_output *output)
{
- struct weston_view *view = output->fullscreen_view.fs->view;
+ struct weston_view *view;
+ if (!output &&
+ !output->fullscreen_view.fs &&
+ !output->fullscreen_view.fs->view) {
+ weston_log("Output %s doesn't have a surface installed!\n", output->name);
+ return;
+ }
+
+ view = output->fullscreen_view.fs->view;
assert(view->is_mapped == true ||
view->surface->is_mapped == true);
assert(view->is_mapped == true ||
view->surface->is_mapped == true);
void
insert_black_surface(struct ivi_output *output)
{
void
insert_black_surface(struct ivi_output *output)
{
- struct weston_view *view = output->fullscreen_view.fs->view;
+ struct weston_view *view;
+ if (!output &&
+ !output->fullscreen_view.fs &&
+ !output->fullscreen_view.fs->view) {
+ weston_log("Output %s doesn't have a surface installed!\n", output->name);
+ return;
+ }
+
+ view = output->fullscreen_view.fs->view;
if (view->is_mapped || view->surface->is_mapped)
return;
if (view->is_mapped || view->surface->is_mapped)
return;