Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 9 Feb 2016 00:36:24 +0000 (01:36 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 9 Feb 2016 00:36:24 +0000 (01:36 +0100)
python/src/com/jetbrains/python/run/PythonProcessRunner.java

index eb4ce2051f7d9f7652a37d5a5e7e1426a252cda2..aef876083361f13ea7eea77910220789d63d9412 100644 (file)
@@ -18,6 +18,7 @@ package com.jetbrains.python.run;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.execution.process.ProcessHandler;
+import com.intellij.openapi.util.registry.Registry;
 import com.jetbrains.python.sdk.flavors.JythonSdkFlavor;
 import com.jetbrains.python.sdk.flavors.PythonSdkFlavor;
 
@@ -39,7 +40,7 @@ public class PythonProcessRunner {
   }
 
   public static ProcessHandler createProcess(GeneralCommandLine commandLine) throws ExecutionException {
-    return createProcess(commandLine, PythonProcessHandler.SOFT_KILL_ON_WIN);
+    return createProcess(commandLine, Registry.is(PythonProcessHandler.KILL_WINDOWS_PROCESSES_SOFTLY));
   }
 
   public static ProcessHandler createProcessHandlingCtrlC(GeneralCommandLine commandLine) throws ExecutionException {