mirror of
https://github.com/rubickCenter/rubick
synced 2025-12-16 23:54:19 +08:00
Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/index.ts
This commit is contained in:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user