Commit 1eb6bc3b authored by actb's avatar actb

Merge branch 'fsIntensity' of into fsIntensity

parents f7994a2c 5294f653
......@@ -527,7 +527,7 @@ function pauseOrKillAll(bKill,leverFile)
if (bKill) {
if (null!==inProcessQ[i].childProc) {
if (process.platform != "win32") {
if (process.platform != "win32" && undefined!=inProcessQ[i].matlabPID) {
// matlab was launched on unix via a script
// it told us its pid right after launch
// we use that to kill the main matlab process here
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment