Skip to content

Commit

Permalink
Merge branch 'main' into fix/eperm_patching
Browse files Browse the repository at this point in the history
  • Loading branch information
flavioislima authored Mar 11, 2025
2 parents d20e860 + 58d1360 commit cc2038a
Show file tree
Hide file tree
Showing 14 changed files with 50 additions and 113 deletions.
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"version": "0.24.0",
"private": true,
"main": "build/main/main.js",
"productName": "HyperPlay",
"homepage": "./",
"license": "GPL-3.0-only",
"description": "HyperPlay",
Expand Down Expand Up @@ -73,7 +72,7 @@
"@hyperplay/chains": "^0.5.0",
"@hyperplay/check-disk-space": "^3.5.2",
"@hyperplay/quests-ui": "^0.1.26",
"@hyperplay/ui": "^1.9.9",
"@hyperplay/ui": "^1.11.1",
"@hyperplay/utils": "^0.3.7",
"@mantine/carousel": "^7.12.0",
"@mantine/core": "^7.12.0",
Expand Down
16 changes: 8 additions & 8 deletions pnpm-lock.yaml

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

1 change: 0 additions & 1 deletion public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,6 @@
"autoUpdateGames": "Automatically update games",
"autovkd3d": "Auto Install/Update VKD3D on Prefix",
"change-target-exe": "Select an alternative EXE to run",
"checkForUpdatesOnStartup": "Check for HyperPlay Updates on Startup",
"crossover-version": "Crossover/Wine Version",
"custom_themes_path": "Custom Themes Path",
"customWineProton": "Custom Wine/Proton Paths",
Expand Down
1 change: 0 additions & 1 deletion src/backend/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ class GlobalConfigV0 extends GlobalConfig {
autoInstallDxvkNvapi: false,
addSteamShortcuts: false,
preferSystemLibs: false,
checkForUpdatesOnStartup: !isLinux,
autoUpdateGames: true,
customWinePaths: isWindows ? null : [],
defaultInstallPath: installPath,
Expand Down
16 changes: 3 additions & 13 deletions src/backend/updater/updater.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { app, dialog, shell } from 'electron'
import { autoUpdater } from 'electron-updater'
import { t } from 'i18next'

import { configStore, icon, isLinux } from '../constants'
import { icon, isLinux } from '../constants'
import { logError, logInfo, LogPrefix } from '../logger/logger'
import { captureException } from '@sentry/electron'
import { getFileSize } from '../utils'
Expand All @@ -12,11 +12,9 @@ import { getErrorMessage, removeCachedUpdatesFolder } from './utils'
// to test auto update on windows locally make sure you added the option verifyUpdateCodeSignature: false
// under build.win in electron-builder.yml and also change the app version to an old one there

const appSettings = configStore.get_nodefault('settings')
const shouldCheckForUpdates = appSettings?.checkForUpdatesOnStartup === true
let newVersion: string

autoUpdater.autoDownload = shouldCheckForUpdates && !isLinux
autoUpdater.autoDownload = !isLinux
autoUpdater.autoInstallOnAppQuit = true

let isAppUpdating = false
Expand All @@ -29,7 +27,7 @@ const MAX_UPDATE_ATTEMPTS = 10
const checkUpdateInterval = 3 * 1000 * 60 * 60

setInterval(async () => {
if (shouldCheckForUpdates && !hasUpdated && !isAppUpdating) {
if (!hasUpdated && !isAppUpdating) {
logInfo('Checking for client updates...', LogPrefix.AutoUpdater)
await autoUpdater.checkForUpdates()
}
Expand All @@ -44,14 +42,6 @@ autoUpdater.on('update-available', async (info) => {
return
}

if (!shouldCheckForUpdates) {
logInfo(
'New update available, but user has disabled auto updates',
LogPrefix.AutoUpdater
)

return
}
newVersion = info.version

trackEvent({
Expand Down
Binary file modified src/frontend/assets/hyperplay/WalletOptionsIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/frontend/assets/hyperplay/metamask-rounded-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 15 additions & 34 deletions src/frontend/assets/hyperplay/mm_icon_md_transparent.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit cc2038a

Please sign in to comment.