Skip to content

Commit a697799

Browse files
committed
Merge branch 'dev' of github.com:imsyy/SPlayer into dev
2 parents 7c59cc2 + 11acbcf commit a697799

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

components.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ declare module 'vue' {
2323
KeyboardSetting: typeof import('./src/components/Setting/KeyboardSetting.vue')['default']
2424
LocalSetting: typeof import('./src/components/Setting/LocalSetting.vue')['default']
2525
Login: typeof import('./src/components/Modal/Login.vue')['default']
26-
LoginPhone: typeof import('./src/components/Modal/loginPhone.vue')['default']
27-
LoginQRCode: typeof import('./src/components/Modal/loginQRCode.vue')['default']
26+
LoginPhone: typeof import('./src/components/Modal/LoginPhone.vue')['default']
27+
LoginQRCode: typeof import('./src/components/Modal/LoginQRCode.vue')['default']
2828
LyricsSetting: typeof import('./src/components/Setting/LyricsSetting.vue')['default']
2929
MainAMLyric: typeof import('./src/components/Player/MainAMLyric.vue')['default']
3030
MainLyric: typeof import('./src/components/Player/MainLyric.vue')['default']

electron/main/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { app, shell, BrowserWindow, BrowserWindowConstructorOptions } from "electron";
22
import { electronApp, optimizer } from "@electron-toolkit/utils";
33
import { join } from "path";
4-
import { release } from "os";
4+
import { release, type } from "os";
55
import { isDev, isMac, appName } from "./utils";
66
import { registerAllShortcuts, unregisterShortcuts } from "./shortcut";
77
import { initTray, MainTray } from "./tray";
@@ -38,7 +38,7 @@ class MainProcess {
3838
constructor() {
3939
log.info("🚀 Main process startup");
4040
// 禁用 Windows 7 的 GPU 加速功能
41-
if (release().startsWith("6.1")) app.disableHardwareAcceleration();
41+
if (release().startsWith("6.1") && type() == 'Windows_NT') app.disableHardwareAcceleration();
4242
// 单例锁
4343
if (!app.requestSingleInstanceLock()) {
4444
log.error("❌ There is already a program running and this process is terminated");

0 commit comments

Comments
 (0)