Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/index.ts
This commit is contained in:
muwoo
2023-10-18 11:03:10 +08:00
9 changed files with 12 additions and 10 deletions

View File

@@ -21,8 +21,8 @@ import {
import '../common/utils/localPlugin';
import registerySystemPlugin from './common/registerySystemPlugin';
import checkVersion from './common/versionHandler';
import registerSystemPlugin from './common/registerSystemPlugin';
class App {
public windowCreator: { init: () => void; getWindow: () => BrowserWindow };
@@ -37,7 +37,7 @@ class App {
if (!gotTheLock) {
app.quit();
} else {
this.systemPlugins = registerySystemPlugin();
this.systemPlugins = registerSystemPlugin();
this.beforeReady();
this.onReady();
this.onRunning();