From 4a67074a67b33b03693013fe268d7373f2b1bf59 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Thu, 8 Dec 2016 15:29:43 +0900 Subject: [PATCH] evas: Don't load wayland engines when running on X evas_render_method_lookup calls evas_module_find_type that in turn actually goes and loads the module. All we wanted to know was whether the render_method corresponded to one of the wayland engines. See 453770137f84afe622156290e7c38d2d1d3845c4 --- src/lib/evas/canvas/evas_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c index b499dcf77c..f4ae8bf554 100644 --- a/src/lib/evas/canvas/evas_main.c +++ b/src/lib/evas/canvas/evas_main.c @@ -999,10 +999,10 @@ evas_output_method_set(Evas *eo_e, int render_method) /* get the engine info struct */ if (e->engine.func->info) e->engine.info = e->engine.func->info(eo_e); - //Wayland already handle seats. - if (render_method == evas_render_method_lookup("wayland_shm") || - render_method == evas_render_method_lookup("wayland_egl")) - return; + // Wayland already handles seats. + if (em->definition && (eina_streq(em->definition->name, "wayland_shm") || + eina_streq(em->definition->name, "wayland_egl"))) + return; e->default_seat = evas_device_add_full(eo_e, "default", "The default seat", NULL, NULL, EVAS_DEVICE_CLASS_SEAT,