mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 10:46:02 +02:00
Code Issues Wiki Activity

Rework fix for bug 420928

Browse source 
We need to continue polling the text model until the terminal is
actually disconnected from the input stream, otherwise error messages
about connect failures don't appear in the terminal.
This commit is contained in:
Anton Leherbauer 2015-05-07 09:44:51 +02:00
parent 53e33dcc46
commit 21e5739a8f
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/org.eclipse.tm.terminal.control/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java
View file

@ -390,7 +390,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
}
disconnectTerminal();
fClipboard.dispose();
fPollingTextCanvasModel.stopPolling();
getTerminalText().dispose();
}
@ -446,6 +445,7 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
job.join();
} catch (InterruptedException e) {}
}
fPollingTextCanvasModel.stopPolling();
}
private void waitForConnect() {
@ -470,6 +470,7 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
if (getState() == TerminalState.CONNECTED)
fFocusListener.captureKeyEvents(true);
}
fPollingTextCanvasModel.startPolling();
startReaderJob();
}
@ -786,7 +787,6 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
// should never happen!
e.printStackTrace();
}
}
public OutputStream getRemoteToTerminalOutputStream() {
@ -1252,12 +1252,10 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
if(fCtlText!=null && !fCtlText.isDisposed()) {
if (isConnected()) {
fCtlText.setCursorEnabled(true);
fPollingTextCanvasModel.startPolling();
} else {
fCtlText.setCursorEnabled(false);
// Stop capturing all key events
fFocusListener.captureKeyEvents(false);
fPollingTextCanvasModel.stopPolling();
}
}
}