Skip to content

Commit

Permalink
1.0.12 lint fix and npm install
Browse files Browse the repository at this point in the history
  • Loading branch information
pauljonescodes committed Feb 28, 2024
1 parent 1e98e2b commit 6bda08d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions release/app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 10 additions & 8 deletions src/main/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
* When running `npm run build` or `npm run build:main`, this file is compiled to
* `./src/main.js` using webpack. This gives us some performance wins.
*/
import { BrowserWindow, app, ipcMain, shell } from 'electron';
import log from 'electron-log';
import { autoUpdater } from 'electron-updater';
import path from 'path';
import { app, BrowserWindow, shell, ipcMain } from 'electron';
import { autoUpdater } from 'electron-updater';
import log from 'electron-log';
import MenuBuilder from './menu';
import { resolveHtmlPath } from './util';

Expand Down Expand Up @@ -81,7 +81,7 @@ const createWindow = async () => {
},
});

mainWindow.loadURL(resolveHtmlPath('./index.html'));
mainWindow.loadURL(resolveHtmlPath('/index.html'));

mainWindow.on('ready-to-show', () => {
if (!mainWindow) {
Expand Down Expand Up @@ -117,7 +117,11 @@ const createWindow = async () => {
*/

app.on('window-all-closed', () => {
app.quit();
// Respect the OSX convention of having the application in memory even
// after all windows have been closed
if (process.platform !== 'darwin') {
app.quit();
}
});

app
Expand All @@ -127,9 +131,7 @@ app
app.on('activate', () => {
// On macOS it's common to re-create a window in the app when the
// dock icon is clicked and there are no other windows open.
if (mainWindow === null) {
createWindow();
}
if (mainWindow === null) createWindow();
});
})
.catch(console.log);

0 comments on commit 6bda08d

Please sign in to comment.