Merge pull request #393 from getferdi/refactor/lock

Fix race condition in Ferdi Lock at startup

1 files changed, 1 insertions, 10 deletions

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 48a83c5a1..bd10ccb4a 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -118,21 +118,12 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
                 type="button"
                 className="sidebar__button"
                 onClick={() => {
-                  // Disable lock first - otherwise the application might not update correctly
                   actions.settings.update({
                     type: 'app',
                     data: {
-                      locked: false,
+                      locked: true,
                     },
                   });
-                  setTimeout(() => {
-                    actions.settings.update({
-                      type: 'app',
-                      data: {
-                        locked: true,
-                      },
-                    });
-                  }, 0);
                 }}
                 data-tip={`${intl.formatMessage(messages.lockFerdi)} (${ctrlKey}+Shift+L)`}
               >