Fixed server crash when meshcmd.js is missing.
Ylian Saint-Hilaire committed
Jun 24, 2020 at 12:39 UTC
a7f4049776d9eabe8f5e0c05dffda78e0ca0d2a4
1 file changed
+1
-1
meshcentral.js
+1
-1
@@ -1977,7 +1977,7 @@ function CreateMeshCentralServer(config, args) {
1977
else if (obj.fs.existsSync(obj.path.join(obj.datapath, 'meshcmd.js'))) { meshcmdPath = obj.path.join(obj.datapath, 'meshcmd.js'); meshCmd = obj.fs.readFileSync(meshcmdPath).toString(); }
1978
else if ((obj.args.minifycore !== false) && (obj.fs.existsSync(obj.path.join(__dirname, 'agents', 'meshcmd.min.js')))) { meshcmdPath = obj.path.join(__dirname, 'agents', 'meshcmd.min.js'); meshCmd = obj.fs.readFileSync(meshcmdPath).toString(); }
1979
else if (obj.fs.existsSync(obj.path.join(__dirname, 'agents', 'meshcmd.js'))) { meshcmdPath = obj.path.join(__dirname, 'agents', 'meshcmd.js'); meshCmd = obj.fs.readFileSync(meshcmdPath).toString(); }
1980
- else { obj.defaultMeshCmd = null; if (func != null) { func(false); } } // meshcmd.js not found
1980
+ else { obj.defaultMeshCmd = null; if (func != null) { func(false); } return; } // meshcmd.js not found
1981
meshCmd = meshCmd.replace("'***Mesh*Cmd*Version***'", '\'' + getCurrentVerion() + '\'');
1982
1983
// Figure out where the modules_meshcmd folder is.