From 338b25dec97aa404cc909778e1b8d0f59120013d Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 10 Nov 2019 08:36:00 +0100
Subject: [PATCH] Managesieve: Fix locked UI after opening filter frame (#7007)

---
 CHANGELOG                          |  2 ++
 plugins/managesieve/managesieve.js | 10 ++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3a45e72c6..23808dd68 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Managesieve: Fix locked UI after opening filter frame (#7007)
+
 RELEASE 1.4.0
 -------------
 - Elastic: Resizeable columns (#6929)
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index 3a9cc9e35..bf8cd39dc 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -426,13 +426,11 @@ rcube_webmail.prototype.load_managesieveframe = function(add_url, reset)
   if (reset)
     this.reset_filters_list();
 
-  if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
-    var lock = this.set_busy(true, 'loading'),
-      target = window.frames[this.env.contentframe];
+  var target = this.get_frame_window(this.env.contentframe),
+    url = this.url('plugin.managesieve-action', '_framed=1' + (add_url ? ('&' + add_url) : ''));
 
-    target.location.href = this.env.comm_path
-      + '&_action=plugin.managesieve-action&_framed=1&_unlock=' + lock
-      + (add_url ? ('&' + add_url) : '');
+  if (target) {
+    this.location_href(url, target, true);
   }
 };