Skip to content

Commit

Permalink
Fix checking for permissions
Browse files Browse the repository at this point in the history
  • Loading branch information
adlk committed Apr 2, 2020
1 parent fa4ac3c commit e201d44
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 8 deletions.
20 changes: 17 additions & 3 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"electron-is-dev": "1.0.1",
"electron-react-titlebar": "0.8.1",
"electron-updater": "4.2.5",
"electron-util": "0.14.0",
"electron-window-state": "5.0.3",
"fs-extra": "7.0.1",
"hex-to-rgba": "1.0.2",
Expand Down
10 changes: 5 additions & 5 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import isDevMode from 'electron-is-dev';
import fs from 'fs-extra';
import path from 'path';
import windowStateKeeper from 'electron-window-state';
import { enforceMacOSAppLocation } from 'electron-util';

// Set app directory before loading user modules
if (process.env.FRANZ_APPDATA_DIR != null) {
Expand All @@ -22,7 +23,6 @@ if (isDevMode) {
app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
}


/* eslint-disable import/first */
import {
isMac,
Expand Down Expand Up @@ -276,12 +276,12 @@ const createWindow = () => {
debug('Tray: hiding tray icon');
trayIcon.hide();
}

if (isMac) {
askFormacOSPermissions();
}
});

if (isMac) {
askFormacOSPermissions();
}

mainWindow.on('show', () => {
debug('Skip taskbar: false');
mainWindow.setSkipTaskbar(false);
Expand Down

0 comments on commit e201d44

Please sign in to comment.