Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Jul 7, 2024. It is now read-only.

Setup tray icon after the app started, not before #170

Merged
koalalorenzo merged 1 commit into from
Aug 8, 2018
Merged

Setup tray icon after the app started, not before #170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@ function startWelcome () {
* 8. show storage window
*/
function startOrion () {
// On MacOS it's expected for the app not to close, and to re-open it from Launchpad
if (process.platform !== 'darwin') {
setupTrayIcon()
}

// Ask github whether there is an update
autoUpdater.checkForUpdates()
autoUpdater.on('update-available', (info) => {
Expand Down Expand Up @@ -270,6 +265,10 @@ function startOrion () {
// Log that we are ready
.then(() => {
console.log('READY')
// On MacOS it's expected for the app not to close, and to re-open it from Launchpad
if (process.platform !== 'darwin') {
setupTrayIcon()
}
loadingWindow.webContents.send('set-progress', {
text: 'Ready!',
percentage: 100
Expand Down Expand Up @@ -304,7 +303,7 @@ app.on('import-from-hash', (hash) => {
app.emit('show-activities-window')

importObjectByHash(hash)
.then(() => {})
.then(() => { })
.catch(err => {
dialog.showErrorBox('Gurl, an error occurred!', `${err}`)
})
Expand Down