e_hwc_window_queue: Do not check the cqueue in the e_hwc_window_queue_user_set

check the cqueue at the call of e_hwc_window_queue_user_set

Change-Id: Ic8af48923f13f55accd46cf64819887b9c1b8ed9

diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c
index 72aaadd..0c94dde 100644 (file)
--- a/src/bin/e_hwc_window.c
+++ b/src/bin/e_hwc_window.c
@@ -1886,6 +1886,7 @@ EINTERN Eina_Bool
 e_hwc_window_constraints_update(E_Hwc_Window *hwc_window)
 {
    E_Hwc_Window_Queue *queue = NULL;
+   struct wayland_tbm_client_queue *cqueue = NULL;
    tdm_error terror;
    int constraints;
 
@@ -1902,6 +1903,9 @@ e_hwc_window_constraints_update(E_Hwc_Window *hwc_window)
      {
          if (!hwc_window->queue)
            {
+              cqueue = _get_wayland_tbm_client_queue(hwc_window->ec);
+              EINA_SAFETY_ON_NULL_RETURN_VAL(cqueue, EINA_FALSE);
+
               queue = e_hwc_window_queue_user_set(hwc_window);
               if (!queue)
                 {

diff --git a/src/bin/e_hwc_window_queue.c b/src/bin/e_hwc_window_queue.c
index 7bfb696..ee2c42a 100644 (file)
--- a/src/bin/e_hwc_window_queue.c
+++ b/src/bin/e_hwc_window_queue.c
@@ -988,7 +988,6 @@ e_hwc_window_queue_deinit(void)
 EINTERN E_Hwc_Window_Queue *
 e_hwc_window_queue_user_set(E_Hwc_Window *hwc_window)
 {
-   struct wayland_tbm_client_queue *cqueue = NULL;
    E_Hwc_Window_Queue *queue = NULL;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(_hwc_winq_mgr, NULL);
@@ -997,9 +996,6 @@ e_hwc_window_queue_user_set(E_Hwc_Window *hwc_window)
    if (e_hwc_window_is_target(hwc_window))
      return _e_hwc_window_queue_get(hwc_window);
 
-   cqueue = _user_cqueue_get(hwc_window->ec);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(cqueue, NULL);
-
    queue = _e_hwc_window_queue_get(hwc_window);
    EINA_SAFETY_ON_NULL_RETURN_VAL(queue, NULL);