### Eclipse Workspace Patch 1.0
#P org.eclipse.rse.shells.ui
Index: src/org/eclipse/rse/internal/shells/ui/actions/SystemTerminateShellAction.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui/src/org/eclipse/rse/internal/shells/ui/actions/SystemTerminateShellAction.java,v
retrieving revision 1.4
diff -u -r1.4 SystemTerminateShellAction.java
--- src/org/eclipse/rse/internal/shells/ui/actions/SystemTerminateShellAction.java	11 May 2007 18:08:15 -0000	1.4
+++ src/org/eclipse/rse/internal/shells/ui/actions/SystemTerminateShellAction.java	2 Aug 2007 14:57:15 -0000
@@ -13,6 +13,7 @@
  * Contributors:
  * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
  * Martin Oberhuber (Wind River) - [174945] Remove obsolete icons from rse.shells.ui
+ * Kevin Doyle (IBM) - [197848] After clicking Cancel Shell the action is still enabled
  ********************************************************************************/
 
 package org.eclipse.rse.internal.shells.ui.actions;
@@ -84,6 +85,8 @@
 			if (cmdSubSystem != null)
 			{
 				cmdSubSystem.cancelShell(command, new NullProgressMonitor());
+				// Shell has been cancelled disable this action
+				setEnabled(false);
 			}
 		}
 		catch (Exception e)
#P org.eclipse.rse.services.local
Index: src/org/eclipse/rse/internal/services/local/shells/LocalHostShell.java
===================================================================
RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalHostShell.java,v
retrieving revision 1.2
diff -u -r1.2 LocalHostShell.java
--- src/org/eclipse/rse/internal/services/local/shells/LocalHostShell.java	5 Jun 2007 10:37:14 -0000	1.2
+++ src/org/eclipse/rse/internal/services/local/shells/LocalHostShell.java	2 Aug 2007 14:57:16 -0000
@@ -12,7 +12,7 @@
  * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
  * 
  * Contributors:
- * {Name} (company) - description of contribution.
+ * Kevin Doyle (IBM) - [197848] After clicking Cancel Shell the action is still enabled
  *******************************************************************************/
 
 package org.eclipse.rse.internal.services.local.shells;
@@ -76,6 +76,9 @@
 	public void exit()
 	{
 		writeToShell("exit"); //$NON-NLS-1$
+		if (_shellThread != null) {
+			_shellThread.stopThread();
+		}
 	}