fix error

getnamo · Aug 2, 2019 · d90e9ff · d90e9ff
1 parent 4aaf0f7
commit d90e9ff
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/Content/Scripts/scriptHandler.js b/Content/Scripts/scriptHandler.js
@@ -110,17 +110,24 @@ const stopScript = (processInfo, callback)=>{
  setTimeout(()=>{
  //graceful exit didn't work, try disconnecting
  try{
- processInfo.child.disconnect();
- callback(null, processId);
-
- //disconnect didn't work, send SIGINT
- setTimeout(()=>{
- if(ipc.isRunning){
- console.log('Still running, forcefully ending ' + processId);
- processInfo.child.kill('SIGINT');
- //console.log(processInfo);
- }
- }, 50)
+ if(ipc.isRunning){
+ processInfo.child.disconnect();
+
+ //disconnect didn't work, send SIGINT
+ setTimeout(()=>{
+ if(ipc.isRunning){
+ console.log('Still running, forcefully ending ' + processId);
+ processInfo.child.kill('SIGINT');
+ //console.log(processInfo);
+ }
+ //either way we definitely stopped
+ callback(null, processId);
+ }, 50);
+ }
+ else
+ {
+ callback(null, processId);
+ }
  }
  catch(e){
  callback('script disconnect error: ' + util.inspect(e));

diff --git a/Source/CommandLine/Private/NodeCmd.cpp b/Source/CommandLine/Private/NodeCmd.cpp
@@ -43,7 +43,7 @@ FNodeCmd::FNodeCmd()
  bIsWatchingScript = false;
 
  //swap this to debug main script with an external local server, otherwise crashes will be relatively opaque
- bUseRemoteMainScript = false;
+ bUseRemoteMainScript = true;
 }
 
 FNodeCmd::~FNodeCmd()