ecore_wl2_window: add code to check tizen_policy and surface

@tizen_only

Change-Id: I0db2545cfdd250e1df661e1f4f0e1a77510c3a83

diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c
index 3125bee..b3d7859 100644 (file)
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -4765,6 +4765,8 @@ EAPI void
 ecore_wl2_window_modal_set(Ecore_Wl2_Window *window, Eina_Bool modal)
 {
    EINA_SAFETY_ON_NULL_RETURN(window);
+   EINA_SAFETY_ON_NULL_RETURN(window->surface);
+   EINA_SAFETY_ON_NULL_RETURN(window->display->wl.tz_policy);
 
    INF("[WINDOW] win:%d, Set the Modal state:%d", window->resource_id, modal);
 
@@ -4779,13 +4781,10 @@ ecore_wl2_window_modal_set(Ecore_Wl2_Window *window, Eina_Bool modal)
 
    if (window->modal != modal)
      {
-        if ((window->surface) && (window->display->wl.tz_policy))
-          {
-             if (modal)
-               tizen_policy_set_modal(window->display->wl.tz_policy, window->surface);
-             else
-               tizen_policy_unset_modal(window->display->wl.tz_policy, window->surface);
-          }
+        if (modal)
+          tizen_policy_set_modal(window->display->wl.tz_policy, window->surface);
+        else
+          tizen_policy_unset_modal(window->display->wl.tz_policy, window->surface);
      }
 
    window->modal = modal;