[Bf-blender-cvs] [4c27ddc14fe] temp-geometry-nodes-attribute-search: Cleanup: Switch order of checks

[Hans Goudey]

Commit: 4c27ddc14fef0f504c0ea53f781116698a722961
Author: Hans Goudey
Date:   Tue Feb 23 17:19:25 2021 -0600
Branches: temp-geometry-nodes-attribute-search
https://developer.blender.org/rB4c27ddc14fef0f504c0ea53f781116698a722961

Cleanup: Switch order of checks

===================================================================

M	source/blender/editors/interface/interface_handlers.c

===================================================================

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 45abf548607..8fa30fdfa3f 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -3410,10 +3410,9 @@ static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data)
       uiButSearch *but_search = (uiButSearch *)but;
       BLI_assert(but->type == UI_BTYPE_SEARCH_MENU);
 
-      if (data->cancel == false) {
+      if (data->cancel == false && !but_search->all_strings_valid) {
         if ((ui_searchbox_apply(but, data->searchbox) == false) &&
-            (ui_searchbox_find_index(data->searchbox, but->editstr) == -1) &&
-            !but_search->all_strings_valid) {
+            (ui_searchbox_find_index(data->searchbox, but->editstr) == -1)) {
           data->cancel = true;
 
           /* ensure menu (popup) too is closed! */