Solidtime/solidtime-desktop
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime-desktop.git synced 2026-05-07 20:32:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

windows: fix javascript crash on window close

Browse Source
This commit is contained in:
Gregor Vostrak
2024-08-28 15:55:49 +02:00
parent aad61cb27f
commit 71afc99d14
3 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+41 -41
View File
@@ -1,12 +1,12 @@
{
"name": "solidtime",
"version": "0.0.33",
"version": "0.0.34",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "solidtime",
"version": "0.0.33",
"version": "0.0.34",
"hasInstallScript": true,
"dependencies": {
"@electron-toolkit/preload": "^3.0.0",
@@ -2616,9 +2616,9 @@
}
},
"node_modules/@sentry/cli": {
"version": "2.34.0",
"resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.34.0.tgz",
"integrity": "sha512-hS3MRtEOT1Y27ufBesTTg4xJx6Msf77U609ncy2u7z8uoTZgO8HNsq9DwuxitX5MTrREEJ+frCMFsYvwqkQcJw==",
"version": "2.34.1",
"resolved": "https://registry.npmjs.org/@sentry/cli/-/cli-2.34.1.tgz",
"integrity": "sha512-hAHvu+XH1kn1ee2NUWvuqAZenK/MrxqQzeIrIYATqF2XGjtSOr7irjAKWjd97/vXdLHA6TBnMW1wHwLcuJK2tg==",
"hasInstallScript": true,
"license": "BSD-3-Clause",
"dependencies": {
@@ -2635,19 +2635,19 @@
"node": ">= 10"
},
"optionalDependencies": {
"@sentry/cli-darwin": "2.34.0",
"@sentry/cli-linux-arm": "2.34.0",
"@sentry/cli-linux-arm64": "2.34.0",
"@sentry/cli-linux-i686": "2.34.0",
"@sentry/cli-linux-x64": "2.34.0",
"@sentry/cli-win32-i686": "2.34.0",
"@sentry/cli-win32-x64": "2.34.0"
"@sentry/cli-darwin": "2.34.1",
"@sentry/cli-linux-arm": "2.34.1",
"@sentry/cli-linux-arm64": "2.34.1",
"@sentry/cli-linux-i686": "2.34.1",
"@sentry/cli-linux-x64": "2.34.1",
"@sentry/cli-win32-i686": "2.34.1",
"@sentry/cli-win32-x64": "2.34.1"
}
},
"node_modules/@sentry/cli-darwin": {
"version": "2.34.0",
"resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.34.0.tgz",
"integrity": "sha512-mzQj58xxRej8uATdXgwHq3KZC2HhfGIyl+jVTh7nXzizOS5OsYZtShpGRxwfeC3eNZ6NqY7h0FWxJD6cUFgauA==",
"version": "2.34.1",
"resolved": "https://registry.npmjs.org/@sentry/cli-darwin/-/cli-darwin-2.34.1.tgz",
"integrity": "sha512-SqlCunwhweMDJNKVf3kabiN6FwpvCIffn2cjfaZD0zqZQ3M1tWMJ/kSA0TGfe7lWu9JloNmVm+ArcudGitvX3w==",
"license": "BSD-3-Clause",
"optional": true,
"os": [
@@ -2658,9 +2658,9 @@
}
},
"node_modules/@sentry/cli-linux-arm": {
"version": "2.34.0",
"resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.34.0.tgz",
"integrity": "sha512-FkNc22FOKU57h+s8ZkqTz/5Y+6GrCK2fSde2dntofOPJheBBuaYz7CDq0dEM9GuBCcvogQj8sf2hMb8+gdJrgA==",
"version": "2.34.1",
"resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm/-/cli-linux-arm-2.34.1.tgz",
"integrity": "sha512-CDhtFbUs16CoU10wEbxnn/pEuenFIMosTcxI7v0gWp3Wo0B2h0bOsLEk9dlT0YsqRTAldKUzef9AVX82m5Svwg==",
"cpu": [
"arm"
],
@@ -2675,9 +2675,9 @@
}
},
"node_modules/@sentry/cli-linux-arm64": {
"version": "2.34.0",
"resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.34.0.tgz",
"integrity": "sha512-Sgl6b2BYI0uNB9WfJLkq4UZsOAXo35uwemtrXIJOz0zc9V4QIFwvmMYXAHpNVC3Z/dSU5PaWBJHEtUKouX5mOQ==",
"version": "2.34.1",
"resolved": "https://registry.npmjs.org/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.34.1.tgz",
"integrity": "sha512-iSl/uNWjKbVPb6ll12SmHG9iGcC3oN8jjzdycm/mD3H/d8DLMloEiaz8lHQnsYCaPiNKwap1ThKlPvnKOU4SNg==",
"cpu": [
"arm64"
],
@@ -2692,9 +2692,9 @@
}
},
"node_modules/@sentry/cli-linux-i686": {
"version": "2.34.0",
"resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.34.0.tgz",
"integrity": "sha512-W7QNzOsbhzsRY5deRsHCqJH4C/yNxwlX6b1JqBO1s7Zb0t5KhM3fFgZJ4DmLZMOvngnJ2wSuyDQCwTNPyEWsAw==",
"version": "2.34.1",
"resolved": "https://registry.npmjs.org/@sentry/cli-linux-i686/-/cli-linux-i686-2.34.1.tgz",
"integrity": "sha512-jq5o49pgzJFv/CQtvx4FLVO1xra22gzP76FtmvPwEhZQhJT6QduW9fpnvVDnOaY8YLzC7GAeszUV6sqZ0MZUqg==",
"cpu": [
"x86",
"ia32"
@@ -2710,9 +2710,9 @@
}
},
"node_modules/@sentry/cli-linux-x64": {
"version": "2.34.0",
"resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.34.0.tgz",
"integrity": "sha512-EJCzldxeNsEIgf5ASj0E9/6J5SwUVgtfoiOYjhBxj2e41jEDlh6o5uMNE4H+J2GX3zPFrN3LgsZYevgPqA35Mw==",
"version": "2.34.1",
"resolved": "https://registry.npmjs.org/@sentry/cli-linux-x64/-/cli-linux-x64-2.34.1.tgz",
"integrity": "sha512-O99RAkrcMErWLPRdza6HaG7kmHCx9MYFNDX6FLrAgSP3oz+X3ral1oDTIrMs4hVbPDK287ZGAqCJtk+1iOjEBg==",
"cpu": [
"x64"
],
@@ -2727,9 +2727,9 @@
}
},
"node_modules/@sentry/cli-win32-i686": {
"version": "2.34.0",
"resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.34.0.tgz",
"integrity": "sha512-bITy/IiT/y1MZhvKSt5UrBEDUNcOtQV20BZDyPriPijBcJ/1U69lgH3IM4bxIaTiicFnMdxbOlQhRSdm8SKURg==",
"version": "2.34.1",
"resolved": "https://registry.npmjs.org/@sentry/cli-win32-i686/-/cli-win32-i686-2.34.1.tgz",
"integrity": "sha512-yEeuneEVmExCbWlnSauhIg8wZDfKxRaou8XRfM6oPlSBu0XO5HUI3uRK5t2xT0zX8Syzh2kCZpdVE1KLavVeKA==",
"cpu": [
"x86",
"ia32"
@@ -2744,9 +2744,9 @@
}
},
"node_modules/@sentry/cli-win32-x64": {
"version": "2.34.0",
"resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.34.0.tgz",
"integrity": "sha512-wpP/w7Fhsr7+cbCgE/OI8hSh3pqESRpcdNgtBQjMuKN2FSE1E+GHrk5GB+fKZG2OAV4IN4HxE/z3NioAJeThfQ==",
"version": "2.34.1",
"resolved": "https://registry.npmjs.org/@sentry/cli-win32-x64/-/cli-win32-x64-2.34.1.tgz",
"integrity": "sha512-mU48VpDTwRgt7/Pf3vk/P87m4kM3XEXHHHfq9EvHCTspFF6GtMfL9njZ7+5Z+7ko852JS4kpunjZtsxmoP4/zA==",
"cpu": [
"x64"
],
@@ -2948,22 +2948,22 @@
}
},
"node_modules/@tailwindcss/forms": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.7.tgz",
"integrity": "sha512-QE7X69iQI+ZXwldE+rzasvbJiyV/ju1FGHH0Qn2W3FKbuYtqp8LKcy6iSw79fVUT5/Vvf+0XgLCeYVG+UV6hOw==",
"version": "0.5.8",
"resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.8.tgz",
"integrity": "sha512-DJs7B7NPD0JH7BVvdHWNviWmunlFhuEkz7FyFxE4japOWYMLl9b1D6+Z9mivJJPWr6AEbmlPqgiFRyLwFB1SgQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"mini-svg-data-uri": "^1.2.3"
},
"peerDependencies": {
"tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1"
"tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1 || >= 4.0.0-alpha.20"
}
},
"node_modules/@tailwindcss/typography": {
"version": "0.5.14",
"resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.14.tgz",
"integrity": "sha512-ZvOCjUbsJBjL9CxQBn+VEnFpouzuKhxh2dH8xMIWHILL+HfOYtlAkWcyoon8LlzE53d2Yo6YO6pahKKNW3q1YQ==",
"version": "0.5.15",
"resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.15.tgz",
"integrity": "sha512-AqhlCXl+8grUz8uqExv5OTtgpjuVIwFTSXTrh8y9/pw6q2ek7fJ+Y8ZEVw7EB2DCcuCOtEjf9w3+J3rzts01uA==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -2973,7 +2973,7 @@
"postcss-selector-parser": "6.0.10"
},
"peerDependencies": {
"tailwindcss": ">=3.0.0 || insiders"
"tailwindcss": ">=3.0.0 || insiders || >=4.0.0-alpha.20"
}
},
"node_modules/@tanstack/match-sorter-utils": {
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "solidtime",
"version": "0.0.33",
"version": "0.0.34",
"description": "Desktop App for solidtime - the modern open-source time tracker",
"main": "./out/main/index.js",
"author": "solidtime.io",
src/main/mainWindow.ts
+6 -5
View File
@@ -25,11 +25,12 @@ export function initializeMainWindow(icon: string) {
let forcequit = false
mainWindow.on('close', (event) => {
if (forcequit === false && process.platform === 'darwin') {
event.preventDefault()
mainWindow.hide()
}
if (process.platform === 'linux') {
if (process.platform === 'darwin') {
if (forcequit === false) {
event.preventDefault()
mainWindow.hide()
}
} else {
app.quit()
}
})