- Fix unlocking in abort_request() (#1488025)

1 files changed, 3 insertions, 3 deletions

diff --git a/program/js/app.js b/program/js/app.js
index 66d24f288..e698e3164 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3611,6 +3611,8 @@ function rcube_webmail()
     var old_value = this.ksearch_value;
     this.ksearch_value = q;
 
+    this.ksearch_destroy();
+
     // ...string is empty
     if (!q.length)
       return;
@@ -3619,8 +3621,6 @@ function rcube_webmail()
     if (old_value && old_value.length && this.env.contacts && !this.env.contacts.length && q.indexOf(old_value) == 0)
       return;
 
-    this.ksearch_destroy();
-
     var i, lock, source, xhr, reqid = new Date().getTime(),
       threads = props && props.threads ? props.threads : 1,
       sources = props && props.sources ? props.sources : [],
@@ -5659,7 +5659,7 @@ function rcube_webmail()
     if (r.request)
       r.request.abort();
     if (r.lock)
-      this.set_busy(r.lock, false);
+      this.set_busy(false, null, r.lock);
   };
 
   // handle HTTP response