aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryce Harrington <bryce@osg.samsung.com>2017-03-15 10:40:01 -0700
committerCedric BAIL <cedric@osg.samsung.com>2017-03-15 10:49:47 -0700
commit24ed55539d76d546a0fb29379acfe241c633ddd8 (patch)
treec25233e93ce406c8fc42a2fcac36bf5918d25856
parentelementary: Fix minor typo in efl_ui_win.eo (diff)
downloadefl-24ed55539d76d546a0fb29379acfe241c633ddd8.tar.gz
evas: drop redundant pointer check
Summary: The function already has a precondition test for !font, so this additional test will never trigger. @fix CID1371525 Reviewers: cedric, jpeg Subscribers: jpeg, cedric Differential Revision: https://phab.enlightenment.org/D4682 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--src/lib/evas/canvas/evas_object_text.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 2e243be884..c91e9d2fc6 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -432,8 +432,7 @@ _evas_text_efl_text_properties_font_set(Eo *eo_obj, Evas_Text_Data *o, const cha
evas_object_async_block(obj);
if ((size == o->cur.size) &&
- ((!font && !o->cur.font) ||
- (font && o->cur.font && !strcmp(font, o->cur.font)))) return;
+ (o->cur.font && !strcmp(font, o->cur.font))) return;
/* We can't assume the given font is same with current fdesc by comparing string.
Since Evas starts to supporting "auto" for language,