mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-28 03:15:33 +02:00
Code Issues Wiki Activity

Bug 465674 - close terminal blocks eclipse UI on Mac OS X

Browse source 
Destroy process before closing streams, except on Windows.
This commit is contained in:
Anton Leherbauer 2015-05-22 12:38:50 +02:00
parent ad325a79bf
commit e7ae930f83
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessConnector.java
View file

@ -243,11 +243,20 @@ public class ProcessConnector extends AbstractStreamsConnector {
// Stop monitoring the process // Stop monitoring the process
monitor.dispose(); monitor.dispose();
boolean isWindows = Platform.OS_WIN32.equals(Platform.getOS());
if (!isWindows) {
// Destroy the process first, except on windows (Bug 465674)
if (process != null) { process.destroy(); process = null; }
}
// Dispose the streams // Dispose the streams
super.doDisconnect(); super.doDisconnect();
// Dispose the process if (isWindows) {
// On Windows destroy the process after closing streams
if (process != null) { process.destroy(); process = null; } if (process != null) { process.destroy(); process = null; }
}
// Set the terminal control state to CLOSED. // Set the terminal control state to CLOSED.
fControl.setState(TerminalState.CLOSED); fControl.setState(TerminalState.CLOSED);