fix: destroying dialogs

ttuanhung · Sep 30, 2019 · a40ccf0 · a40ccf0
1 parent a3050d3
commit a40ccf0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/main/services/multrin.ts b/src/main/services/multrin.ts
@@ -40,7 +40,7 @@ export class Multrin {
     this.appWindow = appWindow;
 
     if (platform() === 'win32') {
-      this.activateWindowCapturing();
+      // this.activateWindowCapturing();
     }
   }
 

diff --git a/src/main/windows-manager.ts b/src/main/windows-manager.ts
@@ -153,7 +153,7 @@ export class WindowsManager {
   }
 
   public addFavicon = async (url: string): Promise<string> => {
-    return new Promise(async (resolve, reject) => {
+    return new Promise(async resolve => {
       if (!this.favicons.get(url)) {
         try {
           const res = await requestURL(url);
@@ -184,7 +184,7 @@ export class WindowsManager {
 
           resolve(str);
         } catch (e) {
-          reject(e);
+          throw e;
         }
       } else {
         resolve(this.favicons.get(url));

diff --git a/src/main/windows/app.ts b/src/main/windows/app.ts
@@ -124,9 +124,21 @@ export class AppWindow extends BrowserWindow {
       writeFileSync(windowDataPath, JSON.stringify(windowState));
 
       this.menuDialog.destroy();
-      this.menuDialog = null;
       this.searchDialog.destroy();
+      this.authDialog.destroy();
+      this.findDialog.destroy();
+      this.formFillDialog.destroy();
+      this.credentialsDialog.destroy();
+      this.permissionsDialog.destroy();
+
+      this.menuDialog = null;
       this.searchDialog = null;
+      this.authDialog = null;
+      this.findDialog = null;
+      this.formFillDialog = null;
+      this.credentialsDialog = null;
+      this.permissionsDialog = null;
+
       this.viewManager.clear();
 
       if (