Fixed an bug
This commit is contained in:
parent
a2eb4620aa
commit
ae723f4531
2
github
2
github
@ -1 +1 @@
|
|||||||
Subproject commit fc5a17d7f08b0eadc2066deb0e491bc3970e9a76
|
Subproject commit 4d57cf2b139d82f4039a9b45c07a8131b5a86312
|
2
main.ts
2
main.ts
@ -1,5 +1,4 @@
|
|||||||
import * as electron from "electron";
|
import * as electron from "electron";
|
||||||
import * as os from "os";
|
|
||||||
import * as rhelper from "./modules/shared/require";
|
import * as rhelper from "./modules/shared/require";
|
||||||
console.log("Native module path: %s", rhelper.native_module_path());
|
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 {
|
} else {
|
||||||
if(process_arguments.length > 0 && process_arguments[0] == "--main-crash-handler")
|
if(process_arguments.length > 0 && process_arguments[0] == "--main-crash-handler")
|
||||||
crash_handler.initialize_handler("main", is_electron_run);
|
crash_handler.initialize_handler("main", is_electron_run);
|
||||||
|
|
||||||
/* app execute */
|
/* app execute */
|
||||||
{
|
{
|
||||||
const versions = process.versions;
|
const versions = process.versions;
|
||||||
|
@ -6,8 +6,6 @@ import * as crash_handler from "../crash_handler";
|
|||||||
import * as electron from "electron";
|
import * as electron from "electron";
|
||||||
import * as path from "path";
|
import * as path from "path";
|
||||||
import * as os from "os";
|
import * as os from "os";
|
||||||
import BrowserWindow = Electron.BrowserWindow;
|
|
||||||
import {main_window} from "../core/main_window";
|
|
||||||
|
|
||||||
/* first of all setup crash handler */
|
/* first of all setup crash handler */
|
||||||
{
|
{
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
"test": "echo \"Error: no test specified\" && exit 1",
|
"test": "echo \"Error: no test specified\" && exit 1",
|
||||||
"start": "electron --js-flags='--expose-gc' --debug --dev-tools --disable-hardware-acceleration .",
|
"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-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-wd": "electron . --disable-hardware-acceleration --debug -t -s -u 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-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-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",
|
"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",
|
"dtest": "electron . dtest",
|
||||||
|
Loading…
Reference in New Issue
Block a user