From 3ac3e9bc71d13ee33efc19bf8297d85bf5a7466d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 22 Apr 2015 17:46:43 -0400 Subject: [PATCH] ensure valid strings are send when sending wl output geometry --- src/bin/e_comp_wl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 0977a8b33..d49ae3732 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2288,7 +2288,7 @@ _e_comp_wl_cb_output_bind(struct wl_client *client, void *data, uint32_t version wl_output_send_geometry(resource, output->x, output->y, output->phys_width, output->phys_height, - output->subpixel, output->make, output->model, + output->subpixel, output->make ?: "", output->model ?: "", output->transform); if (version >= WL_OUTPUT_SCALE_SINCE_VERSION) @@ -2831,7 +2831,7 @@ e_comp_wl_output_init(const char *id, const char *make, const char *model, output->phys_width, output->phys_height, output->subpixel, - output->make, output->model, + output->make ?: "", output->model ?: "", output->transform); if (wl_resource_get_version(resource) >= WL_OUTPUT_SCALE_SINCE_VERSION)