fix search

diff --git a/application/window.c b/application/window.c
index 74b105b67d0cbceae487493493521fd1ee7eb91b..61a693f4a179385ce01f08742254edb5a4476fca 100644 (file)
--- a/application/window.c
+++ b/application/window.c
@@ -570,8 +570,8 @@ void ui_searchbar_next(UiEvent *event, void *userdata) {
         return;
     }
     
-    char *searchstr = ui_get(note->search);
-    if(!searchstr || strlen(searchstr) == 0) {
+    cxstring searchstr = cx_str(ui_get(note->search));
+    if(searchstr.length == 0) {
         return;
     }
     
@@ -582,6 +582,8 @@ void ui_searchbar_next(UiEvent *event, void *userdata) {
     cxstring result = cx_strstr(subtext, searchstr);
     if(result.ptr) {
         size_t result_pos = result.ptr - text.ptr;
-        note->text->setselection(note->text, (int)result_pos, (int)(result_pos + result.length));
+        size_t result_end = result_pos + searchstr.length;
+        note->text->setposition(note->text, result_end);
+        note->text->setselection(note->text, (int)result_pos, (int)result_end);
     }
 }