Fix Ferdi Lock not corrently locking

2 files changed, 20 insertions, 2 deletions

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 1d6bfee33..d0cae3443 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -118,12 +118,21 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                 type="button"
                 className={`sidebar__button sidebar__button--audio ${isAppMuted ? 'is-muted' : ''}`}
                 onClick={() => {
+                  // Disable lock first - otherwise the application might not update correctly
                   actions.settings.update({
                     type: 'app',
                     data: {
-                      locked: true,
+                      locked: false,
                     },
                   });
+                  setTimeout(() => {
+                    actions.settings.update({
+                      type: 'app',
+                      data: {
+                        locked: true,
+                      },
+                    });
+                  }, 0);
                 }}
                 data-tip={`${intl.formatMessage(messages.lockFerdi)} (${ctrlKey}+Shift+L)`}
               >
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 183ae6472..beaafb4d1 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -783,12 +783,21 @@ export default class FranzMenu {
       accelerator: 'CmdOrCtrl+Shift+L',
       enabled: this.stores.settings.app.lockingFeatureEnabled,
       click() {
+        // Disable lock first - otherwise the application might not update correctly
         actions.settings.update({
           type: 'app',
           data: {
-            locked: true,
+            locked: false,
           },
         });
+        setTimeout(() => {
+          actions.settings.update({
+            type: 'app',
+            data: {
+              locked: true,
+            },
+          });
+        }, 0);
       },
     });