fix: object is destroyed block app exit

janhq · Apr 5, 2024 · e53c33d · e53c33d
1 parent 089e311
commit e53c33d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/core/src/node/api/restful/helper/builder.ts b/core/src/node/api/restful/helper/builder.ts
@@ -335,7 335,6 @@ export const chatCompletions = async (request: any, reply: any) => {
  headers['Authorization'] = `Bearer ${apiKey}`
  headers['api-key'] = apiKey
  }
- console.debug(apiUrl)
 
  if (requestedModel.engine === 'openai' && request.body.stop) {
  // openai only allows max 4 stop words

diff --git a/electron/managers/window.ts b/electron/managers/window.ts
@@ -94,8 94,10 @@ class WindowManager {
  }
 
  closeQuickAskWindow(): void {
  if (this._quickAskWindow?.isDestroyed()) return
  this._quickAskWindow?.close()
  this._quickAskWindow?.destroy()
  this._quickAskWindow = undefined
  this._quickAskWindowVisible = false
  }
 
@@ -122,14 124,18 @@ class WindowManager {
  }
 
  cleanUp(): void {
- this.mainWindow?.close()
- this.mainWindow?.destroy()
- this.mainWindow = undefined
- this._quickAskWindow?.close()
- this._quickAskWindow?.destroy()
- this._quickAskWindow = undefined
- this._quickAskWindowVisible = false
- this._mainWindowVisible = false
  if (!this.mainWindow?.isDestroyed()) {
  this.mainWindow?.close()
  this.mainWindow?.destroy()
  this.mainWindow = undefined
  this._mainWindowVisible = false
  }
  if (!this._quickAskWindow?.isDestroyed()) {
  this._quickAskWindow?.close()
  this._quickAskWindow?.destroy()
  this._quickAskWindow = undefined
  this._quickAskWindowVisible = false
  }
  }
 }