From 15890787faf554b492fde03d74c11ff1bd2843bd Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@samsung.com>
Date: Tue, 19 Jun 2018 13:40:27 -0400
Subject: [PATCH] efl_ui_win: do not attempt to focus a null object on focus-in

Summary:
ref T7033
Depends on D6318

Reviewers: bu5hm4n, Hermet, woohyun, devilhorns

Reviewed By: bu5hm4n

Subscribers: cedric, #committers

Tags: #efl

Maniphest Tasks: T7033

Differential Revision: https://phab.enlightenment.org/D6319
---
 src/lib/elementary/efl_ui_win.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 6b18925..cee591a 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1589,7 +1589,8 @@ _elm_win_focus_in(Ecore_Evas *ee)
                }
 
              Evas_Object *focused = efl_ui_focus_manager_focus_get(man);
-             efl_ui_focus_object_focus_set(focused, EINA_TRUE);
+             if (focused)
+               efl_ui_focus_object_focus_set(focused, EINA_TRUE);
           }
      }
 
-- 
2.7.4