e_comp_screen: return false if there is no e_comp
authorSooChan Lim <sc1.lim@samsung.com>
Fri, 3 Jun 2016 11:13:20 +0000 (20:13 +0900)
committerJuyeon Lee <juyeonne.lee@samsung.com>
Fri, 10 Jun 2016 02:14:04 +0000 (11:14 +0900)
The e_comp must be created before the e_comp_screen_init();

Change-Id: Ia3e3cfc5c6bdbad9a12141b77c627a969ad8f8b7

src/bin/e_comp_screen.c

index 32575e1b4747e4ce1991b50ba152cb9f4b19af8c..57d1baae81a676b9e2d54a0a24544c4ac3a2cb39 100644 (file)
@@ -736,22 +736,16 @@ e_comp_screen_init()
    struct xkb_keymap *map = NULL;
    char buf[1024];
 
-   dont_set_ecore_drm_keymap = getenv("NO_ECORE_DRM_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE;
-   dont_use_xkb_cache = getenv("NO_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE;
-
-   TRACE_DS_BEGIN(WL_DRM:INIT);
-
+   TRACE_DS_BEGIN(E_COMP_SCREEN:INIT);
    if (!(comp = e_comp))
      {
-        comp = e_comp_new();
-        if (!comp)
-          {
-             TRACE_DS_END();
-             EINA_SAFETY_ON_NULL_RETURN_VAL(comp, EINA_FALSE);
-          }
-
-        comp->comp_type = E_PIXMAP_TYPE_WL;
+        TRACE_DS_END();
+        EINA_SAFETY_ON_NULL_RETURN_VAL(comp, EINA_FALSE);
      }
+   comp->comp_type = E_PIXMAP_TYPE_WL;
+
+   dont_set_ecore_drm_keymap = getenv("NO_ECORE_DRM_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE;
+   dont_use_xkb_cache = getenv("NO_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE;
 
    /* set gl available if we have ecore_evas support */
    if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_DRM))