Merge branch 'electron-dev' into electron

Future-Scholars · Mar 25, 2022 · b15935e · b15935e
2 parents e9a58ef + 0234dff
commit b15935e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/quasar.conf.win.js b/quasar.conf.win.js
@@ -233,9 +233,6 @@ module.exports = configure(function (ctx) {
           oneClick: false,
           createDesktopShortcut: 'always',
           allowToChangeInstallationDirectory: true,
-          releaseInfo: {
-            releaseNotesFile: './src-electron/release-notes.md',
-          },
         },
         files: [
           '!node_modules/realm/react-native${/*}',

diff --git a/src-electron/electron-main.js b/src-electron/electron-main.js
@@ -355,6 +355,15 @@ autoUpdater.on('error', (error) => {
 // eslint-disable-next-line @typescript-eslint/no-misused-promises
 autoUpdater.on('update-downloaded', async (info) => {
   BrowserWindow.getFocusedWindow().webContents.send('log', info);
+
+  if (!info.releaseNotes) {
+    info.releaseNotes = '';
+  }
+
+  if (!info.version) {
+    info.version = '';
+  }
+
   const dialogOpts = {
     type: 'info',
     buttons: ['Update Now', 'Cancel'],