diff --git a/github b/github index 30322f6..a1f980c 160000 --- a/github +++ b/github @@ -1 +1 @@ -Subproject commit 30322f64162fd4805bc01542cc5cefbb9fe842a3 +Subproject commit a1f980c623d33a448c9acf4a97f1aa795175dcb3 diff --git a/jenkins/create_build.sh b/jenkins/create_build.sh index 95c148b..d96f108 100755 --- a/jenkins/create_build.sh +++ b/jenkins/create_build.sh @@ -123,4 +123,4 @@ function deploy_client() { #compile_scripts #compile_native package_client -deploy_client +#deploy_client diff --git a/modules/renderer/app_backend.ts b/modules/renderer/app_backend.ts index a369fd3..c8c750e 100644 --- a/modules/renderer/app_backend.ts +++ b/modules/renderer/app_backend.ts @@ -24,12 +24,12 @@ function handle_native_connect_request(url_string: string) { return; } - let connection = server_connections.active_connection_handler(); + let connection = server_connections.active_connection(); if(connection.connected) - connection = server_connections.spawn_server_connection_handler(); + connection = server_connections.spawn_server_connection(); handle_connect_request({ - address: url.host, + address: url.host + ":" + (url.searchParams.has("port") ? url.searchParams.get("port") : "9987"), password: { value: url.password, hashed: (url.searchParams.get("password_raw") || "0") == "0" diff --git a/modules/renderer/menu.ts b/modules/renderer/menu.ts index e6bf27b..f8b9f66 100644 --- a/modules/renderer/menu.ts +++ b/modules/renderer/menu.ts @@ -4,7 +4,7 @@ import * as mbar from "tc-shared/ui/frames/MenuBar"; import {Arguments, process_args} from "../shared/process-arguments"; import ipcRenderer = electron.ipcRenderer; -import {Icon} from "tc-shared/FileManager"; +import {LocalIcon} from "tc-shared/file/Icons"; namespace native { import ipcRenderer = electron.ipcRenderer; let _item_index = 1; @@ -71,7 +71,7 @@ namespace native { return !this._enabled; } - icon(klass?: string | Promise | Icon): string { + icon(klass?: string | Promise | LocalIcon): string { if(typeof(klass) === "string") { const buffer = class_to_image(klass); if(buffer)