Mirrors/super-productivity
1
0
Fork 0
mirror of https://github.com/johannesjo/super-productivity.git synced 2026-01-22 18:30:09 +00:00
Code Issues Projects Releases Wiki Activity

fix: windows crashing issue on minimize #3423

Browse source
This commit is contained in:
Johannes Millan 2024-09-09 15:17:24 +02:00
parent 58109d41a2
commit 6a5f21e5f2
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
electron/common.const.ts Normal file
View file

@ -0,0 +1 @@
export const IS_MAC = process.platform === 'darwin';

14
electron/main-window.ts
View file

@ -17,6 +17,7 @@ import { getSettings } from './get-settings';
import { readFileSync, stat } from 'fs';
import { error, log } from 'electron-log/main';
import { GlobalConfigState } from '../src/app/features/config/global-config.model';
import { IS_MAC } from './common.const';
let mainWin: BrowserWindow;
@ -42,14 +43,12 @@ export const getIsAppReady = (): boolean => {
export const createWindow = ({
IS_DEV,
ICONS_FOLDER,
IS_MAC,
quitApp,
app,
customUrl,
}: {
IS_DEV: boolean;
ICONS_FOLDER: string;
IS_MAC: boolean;
quitApp: () => void;
app: App;
customUrl?: string;
@ -242,7 +241,10 @@ const appCloseHandler = (app: App): void => {
getSettings(mainWin, (appCfg: GlobalConfigState) => {
if (appCfg && appCfg.misc.isMinimizeToTray && !(app as any).isQuiting) {
mainWin.hide();
app.dock.hide();
if (IS_MAC) {
app.dock.hide();
}
return;
}
@ -274,8 +276,10 @@ const appMinimizeHandler = (app: App): void => {
if (appCfg.misc.isMinimizeToTray) {
event.preventDefault();
mainWin.hide();
app.dock.hide();
} else {
if (IS_MAC) {
app.dock.hide();
}
} else if (IS_MAC) {
app.dock.show();
}
});

1
electron/start-app.ts
View file

@ -255,7 +255,6 @@ export const startApp = (): void => {
app,
IS_DEV,
ICONS_FOLDER,
IS_MAC,
quitApp,
customUrl,
});