diff --git a/.yarn/cache/electron-npm-33.2.1-7d0242d71d-1f7e4e61fe.zip b/.yarn/cache/electron-npm-33.2.1-7d0242d71d-1f7e4e61fe.zip deleted file mode 100644 index d384f750..00000000 Binary files a/.yarn/cache/electron-npm-33.2.1-7d0242d71d-1f7e4e61fe.zip and /dev/null differ diff --git a/.yarn/cache/electron-npm-34.1.1-cd430a9053-f31cc68aa1.zip b/.yarn/cache/electron-npm-34.1.1-cd430a9053-f31cc68aa1.zip new file mode 100644 index 00000000..350be9cc Binary files /dev/null and b/.yarn/cache/electron-npm-34.1.1-cd430a9053-f31cc68aa1.zip differ diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz index 73d43701..ce532eaa 100644 Binary files a/.yarn/install-state.gz and b/.yarn/install-state.gz differ diff --git a/app/server/applicationsDB.server/applications/mednafen/index.ts b/app/server/applicationsDB.server/applications/mednafen/index.ts index d84c25e1..f3cf0a94 100644 --- a/app/server/applicationsDB.server/applications/mednafen/index.ts +++ b/app/server/applicationsDB.server/applications/mednafen/index.ts @@ -1,10 +1,10 @@ -import type {Application, OptionParamFunction} from "../../types"; -import {isWindows} from "../../../operationsystem.server"; +import type { Application, OptionParamFunction } from "../../types"; +import { isWindows } from "../../../operationsystem.server"; import nodepath from "path"; -import {getVirtualGamepadsSaturn} from "./VirtualGamepadSaturn"; -import {getVirtualGamepadsPcEngine} from "./VirtualGamepadPcEngine"; -import {getKeyboardKey} from "./keyboardConfig"; -import {flatpakId, flatpakOptionParams} from "./definitions"; +import { getVirtualGamepadsSaturn } from "./VirtualGamepadSaturn"; +import { getVirtualGamepadsPcEngine } from "./VirtualGamepadPcEngine"; +import { getKeyboardKey } from "./keyboardConfig"; +import { flatpakId, flatpakOptionParams } from "./definitions"; const getSharedMednafenOptionParams: OptionParamFunction = ({ settings: { @@ -13,14 +13,16 @@ const getSharedMednafenOptionParams: OptionParamFunction = ({ }) => { const hotkeySave = ["-command.save_state", getKeyboardKey("F1")]; const hotkeyLoad = ["-command.load_state", getKeyboardKey("F3")]; - const hotkeyCommandKey = ["-command.input_configc", getKeyboardKey("F2")]; + const hotkeyHelp = ["-command.toggle_help", getKeyboardKey("F2")]; + const hotkeyCommandKey = ["-command.input_configc", getKeyboardKey("F4")]; const hotkeyFullscreen = ["-command.toggle_fs", getKeyboardKey("F11")]; const soundDevice = !isWindows() ? ["-sound.device", "sexyal-literal-default"] : []; - const setFullscreen = fullscreen ? ["-command.video.fs", "1"] : []; + const setFullscreen = fullscreen ? ["-video.fs", "1"] : []; return [ + ...hotkeyHelp, ...hotkeyCommandKey, ...hotkeyFullscreen, ...hotkeySave, diff --git a/package.json b/package.json index 59bf5da8..3e3bc605 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "cross-env": "^7.0.3", "decompress": "^4.2.1", "del-cli": "^5.1.0", - "electron": "33.2.1", + "electron": "34.1.1", "electron-builder": "24.13.3", "eslint": "^8.57.1", "eslint-plugin-react": "^7.36.1", diff --git a/yarn.lock b/yarn.lock index d10df8b2..70932df0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10932,16 +10932,16 @@ __metadata: languageName: node linkType: hard -"electron@npm:33.2.1": - version: 33.2.1 - resolution: "electron@npm:33.2.1" +"electron@npm:34.1.1": + version: 34.1.1 + resolution: "electron@npm:34.1.1" dependencies: "@electron/get": "npm:^2.0.0" "@types/node": "npm:^20.9.0" extract-zip: "npm:^2.0.1" bin: electron: cli.js - checksum: 10/1f7e4e61fe949503a79e08c91fc6a914216868176907b0586c4d47a720f0d16c42cb0594f30efa0608c316e992426befc0b6b214702bf1c4e2bd77115959efec + checksum: 10/f31cc68aa12fa0eb206c2a7e3d6926cf727792619383165c904c02cdf6aa867ea754c57d58b7805fed09203dcaedc345d3be4a0cbd8998d4e3f39594efb6d800 languageName: node linkType: hard @@ -11021,7 +11021,7 @@ __metadata: decompress: "npm:^4.2.1" del-cli: "npm:^5.1.0" dotenv: "npm:^16.4.5" - electron: "npm:33.2.1" + electron: "npm:34.1.1" electron-builder: "npm:24.13.3" electron-updater: "npm:6.3.9" eslint: "npm:^8.57.1"