efl_ui_focus_manager_calc: drop redirect if there is no candidate

1 files changed, 8 insertions, 0 deletions

diff --git a/src/lib/elementary/efl_ui_focus_manager_calc.c b/src/lib/elementary/efl_ui_focus_manager_calc.c
index 6845e1195b..0d29f42a84 100644
--- a/src/lib/elementary/efl_ui_focus_manager_calc.c
+++ b/src/lib/elementary/efl_ui_focus_manager_calc.c
@@ -1730,6 +1730,14 @@ _efl_ui_focus_manager_calc_efl_ui_focus_manager_move(Eo *obj EINA_UNUSED, Efl_Ui
                        efl_ui_focus_manager_focus_set(obj, new_candidate);
                        adjust_redirect_manager = EINA_TRUE;
                     }
+                  else
+                    {
+                       //we set the redirect to NULL since it cannot
+                       //help us, later on the redirect manager can be
+                       //set to the same again, and it is strictly new setted up.
+                       efl_ui_focus_manager_redirect_set(obj, NULL);
+                       pd->redirect_entry = NULL;
+                    }
 
                   candidate = new_candidate;
                }