Skip to content

Commit

Permalink
v10.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sidneys committed Jan 22, 2020
1 parent f31a3e7 commit 66c35b0
Show file tree
Hide file tree
Showing 7 changed files with 1,081 additions and 469 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ install:
- cmd: echo 🔧 Preparing Build Environment (Git)
- cmd: git config --global core.autocrlf input
- cmd: echo 🔧 Preparing Build Environment (Node.js)
- ps: Update-NodeJsInstallation 13.3.0
- ps: Update-NodeJsInstallation 13.7.0
- cmd: npm --global update npm
- cmd: npm --global install yarn

Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ addons:
before_install:
- echo "🔧 Preparing Build Environment (Node.js)"
- curl -o- https://raw.githubusercontent.com/creationix/nvm/master/install.sh | NVM_DIR="${HOME}"/.nvm sh
- source "${HOME}"/.nvm/nvm.sh && nvm install 13.3.0 && nvm use 13.3.0
- source "${HOME}"/.nvm/nvm.sh && nvm install 13.7.0 && nvm use 13.7.0
- npm --global update npm
- npm --global install yarn

Expand Down
16 changes: 16 additions & 0 deletions RELEASENOTES.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
{
"10.5.0": {
"💎 improvements": [
"enhances auto-update user interaction flow"
],
"🚨 fixes": [
"fixes upstream auto-update issue which prevented update installation (https://github.com/electron/electron/pull/21645)",
"fixes application restart, reconnecting to Pushbullet",
"fixes application reset, user data removal",
"fixes macOS 10.15 Catalina startup issue with .zip-based packages & auto-updater payloads (https://github.com/sidneys/pb-for-desktop/issues/113) (macOS)"
],
"👷 internals": [
"upgrades `electron` to `v7.1.9`",
"upgrades local `node_modules`",
"upgrades third-party `node_modules`"
]
},
"10.4.3": {
"💎 improvements": [
"enhances update installation / app restart auto-update user flow"
Expand Down
32 changes: 19 additions & 13 deletions app/scripts/main-process/windows/main-window.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,26 +162,17 @@ class MainWindow {
}


/**
* Init
*/
let init = () => {
logger.debug('init')

// Ensure single instance
if (!global.mainWindow) {
global.mainWindow = new MainWindow()
}
}


/**
* Show main Window when activating app
* @listens Electron.App:activate
*/
app.on('activate', () => {
logger.debug('app:activate')

// Ensure single instance
if (!global.mainWindow) { return }
if (!global.mainWindow.browserWindow) { return }

global.mainWindow.browserWindow.show()
})

Expand All @@ -192,9 +183,24 @@ app.on('activate', () => {
app.on('before-quit', () => {
logger.debug('app:before-quit')

// Ensure single instance
if (!global.mainWindow) { return }

global.mainWindow.allowQuit = true
})

/**
* Init
*/
let init = () => {
logger.debug('init')

// Ensure single instance
if (global.mainWindow) { return }

global.mainWindow = new MainWindow()
}

/**
* @listens Electron.App:ready
*/
Expand Down
Loading

0 comments on commit 66c35b0

Please sign in to comment.