Compare commits
No commits in common. "41933e3c4fc611b41178bdf214d85b34e8ce75ca" and "495a813af164ac44eb4707cb39b58a1bd0c62b03" have entirely different histories.
41933e3c4f
...
495a813af1
Before Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 81 KiB |
BIN
assets/ac_plug.ico
Normal file
After Width: | Height: | Size: 107 KiB |
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 3.8 KiB |
|
@ -6,7 +6,7 @@ import { createSettingsWindow } from "./settings/main";
|
||||||
let tray: any = null;
|
let tray: any = null;
|
||||||
app.whenReady().then(async () => {
|
app.whenReady().then(async () => {
|
||||||
if (await getConfig("windowStyle") == "discord") {
|
if (await getConfig("windowStyle") == "discord") {
|
||||||
tray = new Tray(path.join(__dirname, "../", "/assets/dsc-tray.png"));
|
tray = new Tray(path.join(__dirname, "../", "/assets/ac_plug.png"));
|
||||||
const contextMenu = Menu.buildFromTemplate([
|
const contextMenu = Menu.buildFromTemplate([
|
||||||
{
|
{
|
||||||
label: "Open ArmCord",
|
label: "Open ArmCord",
|
||||||
|
|
|
@ -21,7 +21,7 @@ export async function sleep(ms: number) {
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function checkIfConfigIsBroken() {
|
export async function checkIfConfigIsBroken() {
|
||||||
if (await getConfig("0") == "d") {
|
if ((await getConfig("0")) == "d") {
|
||||||
console.log("Detected a corrupted config");
|
console.log("Detected a corrupted config");
|
||||||
setup();
|
setup();
|
||||||
dialog.showErrorBox(
|
dialog.showErrorBox(
|
||||||
|
|
|
@ -8,7 +8,6 @@ import {checkIfConfigIsBroken, firstRun, getConfig, contentPath} from "./utils";
|
||||||
import {registerIpc} from "./ipc";
|
import {registerIpc} from "./ipc";
|
||||||
import startServer from "./socket"
|
import startServer from "./socket"
|
||||||
import contextMenu from "electron-context-menu";
|
import contextMenu from "electron-context-menu";
|
||||||
export var icon: string;
|
|
||||||
export let mainWindow: BrowserWindow;
|
export let mainWindow: BrowserWindow;
|
||||||
export let inviteWindow: BrowserWindow;
|
export let inviteWindow: BrowserWindow;
|
||||||
let guestWindows: BrowserWindow[] = [];
|
let guestWindows: BrowserWindow[] = [];
|
||||||
|
|