From c355125326e35ece09970f4cb821670fa557fbdf Mon Sep 17 00:00:00 2001
From: audric <audric@loki.network>
Date: Thu, 19 Aug 2021 17:54:33 +1000
Subject: [PATCH] fix start of app with password set

---
 bower.json                     | 1 +
 js/modules/types/attachment.js | 1 +
 main.js                        | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/bower.json b/bower.json
index a853b9a72..08a87c072 100644
--- a/bower.json
+++ b/bower.json
@@ -25,6 +25,7 @@
   "concat": {
     "app": [
       "node_modules/jquery/dist/jquery.js",
+      "node_modules/bytebuffer/dist/bytebuffer.min.js",
       "node_modules/long/dist/long.js",
       "components/protobuf/**/*.js",
       "node_modules/mustache/mustache.js",
diff --git a/js/modules/types/attachment.js b/js/modules/types/attachment.js
index 834401f39..84253b8fa 100644
--- a/js/modules/types/attachment.js
+++ b/js/modules/types/attachment.js
@@ -155,6 +155,7 @@ exports.loadData = readAttachmentData => {
     }
 
     const isAlreadyLoaded = exports.hasData(attachment);
+
     if (isAlreadyLoaded) {
       return attachment;
     }
diff --git a/main.js b/main.js
index 83ba30ed4..841e9029c 100644
--- a/main.js
+++ b/main.js
@@ -466,7 +466,10 @@ function showPasswordWindow() {
     autoHideMenuBar: false,
     webPreferences: {
       nodeIntegration: false,
+      enableRemoteModule: true,
       nodeIntegrationInWorker: false,
+      contextIsolation: false,
+
       // sandbox: true,
       preload: path.join(__dirname, 'password_preload.js'),
       nativeWindowOpen: true,