9724: Ignore action enablement not reset until resource reselected

1 files changed, 9 insertions, 6 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java
index cc9899c34..619b60508 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/IgnoreAction.java
@@ -42,7 +42,7 @@ public class IgnoreAction extends TeamAction {
 		}
 		return true;
 	}
-	public void run(IAction action) {
+	public void run(final IAction action) {
 		run(new WorkspaceModifyOperation() {
 			public void execute(IProgressMonitor monitor) throws InterruptedException, InvocationTargetException {
 				IResource[] resources = getSelectedResources();
@@ -57,12 +57,15 @@ public class IgnoreAction extends TeamAction {
 							cvsResource = new LocalFolder(resource.getLocation().toFile());
 							break;
 					}
-					if (cvsResource != null) {
-						try {
-							cvsResource.setIgnored();
-						} catch (CVSException e) {
-							ErrorDialog.openError(getShell(), null, null, e.getStatus());
+					if (cvsResource == null) return;
+					try {
+						cvsResource.setIgnored();
+						if (action != null) {
+							action.setEnabled(false);
 						}
+					} catch (CVSException e) {
+						ErrorDialog.openError(getShell(), null, null, e.getStatus());
+						return;
 					}
 				}
 			}