Attachment #75235 for bug #197848

Lines 13-18 Link Here

(-)src/org/eclipse/rse/internal/shells/ui/actions/SystemTerminateShellAction.java (+3 lines)
13	* Contributors:	13	* Contributors:
14	* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API	14	* Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
15	* Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui	15	* Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui
		16	* Kevin Doyle (IBM) - [197848] After clicking Cancel Shell the action is still enabled
16	********************************************************************************/	17	********************************************************************************/
17		18
18	package org.eclipse.rse.internal.shells.ui.actions;	19	package org.eclipse.rse.internal.shells.ui.actions;
Lines 84-89 Link Here
84	if (cmdSubSystem != null)	85	if (cmdSubSystem != null)
85	{	86	{
86	cmdSubSystem.cancelShell(command, new NullProgressMonitor());	87	cmdSubSystem.cancelShell(command, new NullProgressMonitor());
		88	// Shell has been cancelled disable this action
		89	setEnabled(false);
87	}	90	}
88	}	91	}
89	catch (Exception e)	92	catch (Exception e)

Lines 12-18 Link Here

(-)src/org/eclipse/rse/internal/services/local/shells/LocalHostShell.java (-1 / +4 lines)
12	* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.	12	* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
13	*	13	*
14	* Contributors:	14	* Contributors:
15	* {Name} (company) - description of contribution.	15	* Kevin Doyle (IBM) - [197848] After clicking Cancel Shell the action is still enabled
16	*******************************************************************************/	16	*******************************************************************************/
17		17
18	package org.eclipse.rse.internal.services.local.shells;	18	package org.eclipse.rse.internal.services.local.shells;
Lines 76-81 Link Here
76	public void exit()	76	public void exit()
77	{	77	{
78	writeToShell("exit"); //$NON-NLS-1$	78	writeToShell("exit"); //$NON-NLS-1$
		79	if (_shellThread != null) {
		80	_shellThread.stopThread();
		81	}
79	}	82	}
80		83
81		84

Return to bug 197848