devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=e78abc23c16bceb05ba4c1d55d67b68818c00189

commit e78abc23c16bceb05ba4c1d55d67b68818c00189
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Tue Jul 21 09:03:59 2015 -0400

    desklock: Fix T2589: Screen Lock crashes in E
    
    Don't call ecore_x functions unless we are using an X11 compositor.
    
    Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
 src/modules/conf_display/e_int_config_desklock.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/conf_display/e_int_config_desklock.c 
b/src/modules/conf_display/e_int_config_desklock.c
index cff0f73..8e96d9e 100644
--- a/src/modules/conf_display/e_int_config_desklock.c
+++ b/src/modules/conf_display/e_int_config_desklock.c
@@ -151,7 +151,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
 
    cfdata->bg_method_prev = cfdata->bg_method;
 #ifndef HAVE_WAYLAND_ONLY
-   cfdata->use_xscreensaver = ecore_x_screensaver_event_available_get();
+   if (e_comp->comp_type == E_PIXMAP_TYPE_X)
+     cfdata->use_xscreensaver = ecore_x_screensaver_event_available_get();
 #endif
 
    cfdata->desklock_auth_method = e_config->desklock_auth_method;

-- 


Reply via email to