From 108b5fe21bbfad270ecab9db7a4fc3cbe7dadf53 Mon Sep 17 00:00:00 2001 From: IrosTheBeggar Date: Fri, 25 Oct 2019 13:59:06 -0400 Subject: [PATCH] fixed some ui stuff --- electron/index3.html | 4 ++-- mstream-electron.js | 5 +++-- package.json | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/electron/index3.html b/electron/index3.html index 30fd013..13678c1 100644 --- a/electron/index3.html +++ b/electron/index3.html @@ -101,7 +101,7 @@ const shell = require('electron').shell const apiEndpoint = 'https://api.mstream.io'; - const configFile = path.join(app.getPath('userData'), 'save/server-config.json'); + const configFile = path.join(app.getPath('userData'), 'save/server-config-v2.json'); var loadJson = {}; var editThisUser; var bootFlag = false; @@ -191,7 +191,7 @@ } if (!loadJson.transcode.defaultBitrate) { - loadJson.transcode.defaultBitrate = '96'; + loadJson.transcode.defaultBitrate = '96k'; } // Auto DNS Testing diff --git a/mstream-electron.js b/mstream-electron.js index 0593b39..465a647 100644 --- a/mstream-electron.js +++ b/mstream-electron.js @@ -104,13 +104,14 @@ function createMainWindow() { // Create the browser window. mainWindow = new BrowserWindow({ webPreferences: { nodeIntegration: true }, width: 850, height: 550, icon: fe.join(__dirname, '/electron/mstream-logo-cut.png') }); - mainWindow.loadURL('file://' + __dirname + '/electron/index3.html'); mainWindow.setMenu(null); + + mainWindow.loadURL('file://' + __dirname + '/electron/index3.html'); // Open the DevTools. // mainWindow.webContents.openDevTools(); // Emitted when the window is closed. - mainWindow.on('closed', function () { + mainWindow.on('closed', () => { // Dereference the window object, usually you would store windows mainWindow = null; }); diff --git a/package.json b/package.json index b22bae5..a08dadc 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "build": { "appId": "io.mstream.server", "productName": "mStream Server", - "electronVersion": "6.0.12", + "electronVersion": "6.1.2", "asar": false, "files": [ "**/*",