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

RESOLVED - bug 217675: NPE or SWTException when closing Terminal View while connection establishing

Browse source 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=217675
This commit is contained in:
Michael Scharf 2008-02-13 14:14:07 +00:00
parent c836c0b410
commit c4caf878b3
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/control/impl/TerminalControl.java
View file

@ -13,6 +13,7 @@
* Contributors: * Contributors:
* Michael Scharf (Wind River) - split into core, view and connector plugins * Michael Scharf (Wind River) - split into core, view and connector plugins
* Martin Oberhuber (Wind River) - fixed copyright headers and beautified * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
* Ruslan Sychev - [217675] NPE or SWTException when closing Terminal View while connection establishing
*******************************************************************************/ *******************************************************************************/
package org.eclipse.tm.internal.terminal.control.impl; package org.eclipse.tm.internal.terminal.control.impl;
@ -285,6 +286,10 @@ public class TerminalControl implements ITerminalControlForText, ITerminalContro
fDisplay.sleep(); fDisplay.sleep();
} }
if(getCtlText().isDisposed()) {
disconnectTerminal();
return;
}
if (!getMsg().equals("")) //$NON-NLS-1$ if (!getMsg().equals("")) //$NON-NLS-1$
{ {
showErrorMessage(getMsg()); showErrorMessage(getMsg());

5
org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100TerminalControl.java
View file

@ -17,6 +17,7 @@
* Martin Oberhuber (Wind River) - [206883] Serial Terminal leaks Jobs * Martin Oberhuber (Wind River) - [206883] Serial Terminal leaks Jobs
* Martin Oberhuber (Wind River) - [208145] Terminal prints garbage after quick disconnect/reconnect * Martin Oberhuber (Wind River) - [208145] Terminal prints garbage after quick disconnect/reconnect
* Martin Oberhuber (Wind River) - [207785] NPE when trying to send char while no longer connected * Martin Oberhuber (Wind River) - [207785] NPE when trying to send char while no longer connected
* Ruslan Sychev - [217675] NPE or SWTException when closing Terminal View while connection establishing
*******************************************************************************/ *******************************************************************************/
package org.eclipse.tm.internal.terminal.emulator; package org.eclipse.tm.internal.terminal.emulator;
@ -322,6 +323,10 @@ public class VT100TerminalControl implements ITerminalControlForText, ITerminalC
fDisplay.sleep(); fDisplay.sleep();
} }
if(getCtlText().isDisposed()) {
disconnectTerminal();
return;
}
if (!getMsg().equals("")) //$NON-NLS-1$ if (!getMsg().equals("")) //$NON-NLS-1$
{ {
showErrorMessage(getMsg()); showErrorMessage(getMsg());