From 7bb8512afb14e7642ab44850d313df850881ea86 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 8 Apr 2018 12:49:48 -0400 Subject: Fix assertions with side-effects Fixes #1725 --- examples/layer-shell.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/layer-shell.c b/examples/layer-shell.c index 0aac0839..d24399e4 100644 --- a/examples/layer-shell.c +++ b/examples/layer-shell.c @@ -431,11 +431,14 @@ int main(int argc, char **argv) { return 1; } - assert(cursor_theme = wl_cursor_theme_load(NULL, 16, shm)); + cursor_theme = wl_cursor_theme_load(NULL, 16, shm); + assert(cursor_theme); struct wl_cursor *cursor; - assert(cursor = wl_cursor_theme_get_cursor(cursor_theme, "crosshair")); + cursor = wl_cursor_theme_get_cursor(cursor_theme, "crosshair"); + assert(cursor); cursor_image = cursor->images[0]; - assert(cursor_surface = wl_compositor_create_surface(compositor)); + cursor_surface = wl_compositor_create_surface(compositor) + assert(cursor_surface); EGLint attribs[] = { EGL_ALPHA_SIZE, 8, EGL_NONE }; wlr_egl_init(&egl, EGL_PLATFORM_WAYLAND_EXT, display, -- cgit v1.2.3