discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=865774bf81eac6154e69ecc36fdfffa77d109cd3

commit 865774bf81eac6154e69ecc36fdfffa77d109cd3
Author: Mike Blumenkrantz <[email protected]>
Date:   Tue Jun 19 13:40:27 2018 -0400

    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 64ed649dcf..60f8600bfe 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1324,7 +1324,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);
      }
 
    evas_object_smart_callback_call(obj, SIG_FOCUS_IN, NULL);

-- 


Reply via email to