From: JinYong Park <j4939.park@samsung.com>
Date: Mon, 22 Jan 2018 07:26:23 +0000 (+0900)
Subject: ctxpopup: fix build warning
X-Git-Tag: submit/tizen/20180124.103314^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fae0785158dcf35a349c3524809de96765d5dfd9;p=platform%2Fupstream%2Felementary.git

ctxpopup: fix build warning

@tizen_fix

Change-Id: I102f8cd43efd7aa7d7627586cb89576626147010
Signed-off-by: JinYong Park <j4939.park@samsung.com>
---

diff --git a/src/mobile_lib/elc_ctxpopup.c b/src/mobile_lib/elc_ctxpopup.c
index ffb021d55..3e016a6ff 100644
--- a/src/mobile_lib/elc_ctxpopup.c
+++ b/src/mobile_lib/elc_ctxpopup.c
@@ -561,14 +561,22 @@ _base_geometry_calc(Evas_Object *obj,
    evas_object_size_hint_max_get(obj, &max_size.x, &max_size.y);
    if (max_size.x == -1)
      {
-        if ((str = edje_object_data_get(sd->layout, "match_max_width")) &&
-            (!strcmp(str, "portrait_width")) && (win))
-          elm_win_screen_size_get(win, NULL, NULL, &max_size.x, NULL);
-        else if (str = edje_object_data_get(sd->layout, "visible_maxw"))
-          max_size.x = (int)(atoi(str)
-                             * elm_config_scale_get()
-                             * elm_object_scale_get(obj)
-                             / edje_object_base_scale_get(sd->layout) + 0.5);
+        str = edje_object_data_get(sd->layout, "match_max_width");
+
+        if ((str) && (win) && (!strcmp(str, "portrait_width")))
+          {
+             elm_win_screen_size_get(win, NULL, NULL, &max_size.x, NULL);
+          }
+        else
+          {
+             str = edje_object_data_get(sd->layout, "visible_maxw");
+
+             if (str)
+               max_size.x = (int)(atoi(str)
+                                  * elm_config_scale_get()
+                                  * elm_object_scale_get(obj)
+                                  / edje_object_base_scale_get(sd->layout) + 0.5);
+          }
      }
    if (max_size.y == -1)
      {