diff --git a/github b/github index fc5a17d..4d57cf2 160000 --- a/github +++ b/github @@ -1 +1 @@ -Subproject commit fc5a17d7f08b0eadc2066deb0e491bc3970e9a76 +Subproject commit 4d57cf2b139d82f4039a9b45c07a8131b5a86312 diff --git a/main.ts b/main.ts index c087233..6e08a06 100644 --- a/main.ts +++ b/main.ts @@ -1,5 +1,4 @@ import * as electron from "electron"; -import * as os from "os"; import * as rhelper from "./modules/shared/require"; console.log("Native module path: %s", rhelper.native_module_path()); @@ -29,6 +28,7 @@ if(process_arguments.length > 0 && process_arguments[0] === "crash-handler") { } else { if(process_arguments.length > 0 && process_arguments[0] == "--main-crash-handler") crash_handler.initialize_handler("main", is_electron_run); + /* app execute */ { const versions = process.versions; diff --git a/modules/renderer/index.ts b/modules/renderer/index.ts index c0b7859..a46fa46 100644 --- a/modules/renderer/index.ts +++ b/modules/renderer/index.ts @@ -6,8 +6,6 @@ import * as crash_handler from "../crash_handler"; import * as electron from "electron"; import * as path from "path"; import * as os from "os"; -import BrowserWindow = Electron.BrowserWindow; -import {main_window} from "../core/main_window"; /* first of all setup crash handler */ { diff --git a/package.json b/package.json index 424023f..bdf55d2 100644 --- a/package.json +++ b/package.json @@ -8,8 +8,8 @@ "test": "echo \"Error: no test specified\" && exit 1", "start": "electron --js-flags='--expose-gc' --debug --dev-tools --disable-hardware-acceleration .", "start-d": "electron . --disable-hardware-acceleration --debug -t -u http://clientapi.teaspeak.dev/", - "start-wd": "electron . --disable-hardware-acceleration --debug -t -su http://localhost/TeaWeb/client-api/environment/", - "start-d1": "electron . --disable-hardware-acceleration --debug -t --gdb -su http://clientapi.teaspeak.dev/ --updater-ui-loader_type=0", + "start-wd": "electron . --disable-hardware-acceleration --debug -t -s -u http://localhost/TeaWeb/client-api/environment/", + "start-d1": "electron . --disable-hardware-acceleration --debug -t --gdb -s -u=http://clientapi.teaspeak.dev/ --updater-ui-loader_type=0", "start-n": "electron . -t --disable-hardware-acceleration --no-single-instance -u=https://clientapi.teaspeak.de/ -d --updater-ui-loader_type=0", "start-01": "electron . --updater-channel=test -u=http://dev.clientapi.teaspeak.de/ -d --updater-ui-loader_type=0 --updater-local-version=1.0.1", "dtest": "electron . dtest",