diff --git a/manager/javascripts/dcsinstance.js b/manager/javascripts/dcsinstance.js index 2e2c58bb..c5fea078 100644 --- a/manager/javascripts/dcsinstance.js +++ b/manager/javascripts/dcsinstance.js @@ -52,7 +52,6 @@ class DCSInstance { /* Check that the registry read was successfull */ let customSavedGamesFolder = (await getManager().getOptions()).savedGamesFolder; - console.log((await getManager().getOptions())) if (customSavedGamesFolder !== undefined || (result[shellFoldersKey] !== undefined && result[shellFoldersKey]["exists"] && result[shellFoldersKey]['values'][saveGamesKey] !== undefined && result[shellFoldersKey]['values'][saveGamesKey]['value'] !== undefined)) { try { /* Read all the folders in Saved Games */ diff --git a/manager/javascripts/manager.js b/manager/javascripts/manager.js index 8f4b701e..5f2558b1 100644 --- a/manager/javascripts/manager.js +++ b/manager/javascripts/manager.js @@ -418,7 +418,7 @@ class Manager { /* Installation type page */ } else if (this.activePage == this.cameraPage) { if (await this.checkDCSRunning()) { - showConfirmPopup(`
DCS is running!
Please stop the DCS instance you are trying to add Olympus to, then select Accept
`, async () => { + showConfirmPopup(`
DCS is running!
Please stop the DCS instance you are trying to add Olympus to, then select Accept.
You can click Accept immediately if the running DCS instance is not the one you are adding Olympus to.
`, async () => { /* Nested popup calls need to wait for animation to complete */ await sleep(300); @@ -433,7 +433,7 @@ class Manager { } else if (this.activePage == this.expertSettingsPage) { if (await this.checkPorts() && await this.checkPasswords()) { if (await this.checkDCSRunning()) { - showConfirmPopup(`
DCS is running!
Please stop the DCS instance you are trying to add Olympus to, then select Accept
`, async () => { + showConfirmPopup(`
DCS is running!
Please stop the DCS instance you are trying to add Olympus to, then select Accept.
You can click Accept immediately if the running DCS instance is not the one you are adding Olympus to.
`, async () => { /* Nested popup calls need to wait for animation to complete */ await sleep(300); @@ -644,7 +644,7 @@ class Manager { showErrorPopup("
The selected Olympus instance is currently active
Please stop DCS and Olympus Server/Client before removing it!
") } else { if (await this.checkDCSRunning()) { - showConfirmPopup(`
DCS is running!
Please stop the DCS instance you are trying to remove Olympus from, then select Accept
`, async () => { + showConfirmPopup(`
DCS is running!
Please stop the DCS instance you are trying to remove Olympus from, then select Accept
.
You can click Accept immediately if the running DCS instance is not the one you are removing Olympus from.`, async () => { /* Nested popup calls need to wait for animation to complete */ await sleep(300); @@ -802,7 +802,6 @@ class Manager { async checkDCSRunning() { let ps = new Promise((res, rej) => { exec('tasklist', function(err, stdout, stderr) { - console.log(stdout) if (stdout.toLowerCase().includes("dcs.exe") || stdout.includes("dcs_server.exe")) { res(true); } else {