diff options
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java index 41219d0b2..02f3a512e 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java @@ -71,6 +71,7 @@ public class SyncAction extends WorkspaceAction { } }); final SyncInfo info = subscriber.getSyncInfo(resource); + if (info == null) return; shell.getDisplay().syncExec(new Runnable() { public void run() { if (info.getKind() == SyncInfo.IN_SYNC) { @@ -104,6 +105,6 @@ public class SyncAction extends WorkspaceAction { * @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource) */ protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException { - return super.isEnabledForCVSResource(cvsResource) || cvsResource.getParent().isCVSFolder(); + return (super.isEnabledForCVSResource(cvsResource) || (cvsResource.getParent().isCVSFolder() && !cvsResource.isIgnored())); } }
\ No newline at end of file |