fix for mistake in own recent commit, broke operator search (r56465).
authorCampbell Barton <ideasman42@gmail.com>
Fri, 3 May 2013 22:43:02 +0000 (22:43 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 3 May 2013 22:43:02 +0000 (22:43 +0000)
source/blender/editors/interface/interface_handlers.c

index b9648a483fec725637fab6dedfd070e47da73b58..3ad721eaa754d4e50a26d12804d9a816fcbdf56c 100644 (file)
@@ -2057,7 +2057,7 @@ static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data)
                
                if (data->searchbox) {
                        if (data->cancel == false) {
-                               if ((ui_searchbox_apply(but, data->searchbox) == false) ||
+                               if ((ui_searchbox_apply(but, data->searchbox) == false) &&
                                    (ui_searchbox_find_index(data->searchbox, but->editstr) == -1))
                                {
                                        data->cancel = true;