Fixed Windows Service Start
Ylian Saint-Hilaire committed
Jul 23, 2019 at 14:09 UTC
36489020cfd07e1df8f9e87af9710e4c1ea26cc5
3 files changed
+5
-5
meshcentral.js
+1
-1
@@ -157,7 +157,7 @@ function CreateMeshCentralServer(config, args) {
157
for (i in process.argv) {
158
if (i > 0) {
159
var arg = process.argv[i];
160
- if ((arg.length > 0) && ((arg.indexOf(' ') >= 0) || (arg.indexOf('&') >= 0))) { startArgs.push('"' + arg + '"'); } else { startArgs.push(arg); }
160
+ if ((arg.length > 0) && ((arg.indexOf(' ') >= 0) || (arg.indexOf('&') >= 0))) { startArgs.push(arg); } else { startArgs.push(arg); }
161
}
162
}
163
startArgs.push('--launch', process.pid);
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.3.8-k",
3
+ "version": "0.3.8-l",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
views/default.handlebars
+3
-3
@@ -482,6 +482,7 @@
482
</div>
483
<div>
484
<select id="deskkeys">
485
+ <option value=10>Ctrl+Alt+Del</option>
486
<option value=5>Win</option>
487
<option value=0>Win+Down</option>
488
<option value=1>Win+Up</option>
@@ -495,7 +496,6 @@
496
</select>
497
<input id="DeskWD" type=button value="Send" onkeypress="return false" onkeydown="return false" onclick="deskSendKeys()">
498
<input id="DeskClip" style="" type="button" value="Clipboard" onkeypress="return false" onkeydown="return false" onclick="showDeskClip()">
498
- <input id="DeskCAD" type="button" value="Ctrl-Alt-Del" onkeypress="return false" onkeydown="return false" onclick="sendCAD()">
499
<label><span id="DeskControlSpan" title="Toggle mouse and keyboard input"><input id="DeskControl" type="checkbox" onkeypress="return false" onkeydown="return false" onclick="toggleKvmControl()">Input</span></label>
500
</div>
501
</div>
@@ -4547,8 +4547,6 @@
4547
QE('connectbutton1h', hwonline);
4548
QE('deskSaveBtn', deskState == 3);
4549
QV('deskFocusBtn', (desktop != null) && (desktop.contype == 2) && (deskState != 0) && (desktopsettings.showfocus));
4550
- QV('DeskCAD', inputAllowed);
4551
- QE('DeskCAD', deskState == 3);
4550
QV('DeskClip', (currentNode.agent) && (currentNode.agent.id != 11) && (currentNode.agent.id != 16) && ((desktop == null) || (desktop.contype != 2))); // Clipboard not supported on MacOS
4551
QE('DeskClip', deskState == 3);
4552
QV('DeskWD', (currentNode.agent) && (currentNode.agent.id < 5) && inputAllowed);
@@ -4971,6 +4969,8 @@
4969
} else {
4970
desktop.m.SendKeyMsgKC([[desktop.m.KeyAction.EXDOWN, 18], [desktop.m.KeyAction.DOWN, 9], [desktop.m.KeyAction.UP, 9], [desktop.m.KeyAction.EXUP, 18]]); // MeshAgent: Alt press, 'TAB' press, 'TAB' release, Alt release
4971
}
4972
+ } else if (ks == 10) { // CTRL-ALT-DEL
4973
+ desktop.m.sendcad();
4974
}
4975
}
4976