Bug 61664 Double progres dialog open sync/compare on single file

1 files changed, 13 insertions, 11 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 a0a65a413..41219d0b2 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
@@ -65,25 +65,27 @@ public class SyncAction extends WorkspaceAction {
 				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
 					try {	
 						subscriber.refresh(new IResource[]{resource}, IResource.DEPTH_ZERO, monitor);
-						final SyncInfo info = subscriber.getSyncInfo(resource);
-						shell.getDisplay().syncExec(new Runnable() {
-							public void run() {
-								if (info.getKind() == SyncInfo.IN_SYNC) {
-									MessageDialog.openInformation(shell, Policy.bind("SyncAction.noChangesTitle"), Policy.bind("SyncAction.noChangesMessage")); //$NON-NLS-1$ //$NON-NLS-2$
-								} else {
-									SyncInfoCompareInput input = new SyncInfoCompareInput(subscriber.getName(), info);
-									CompareUI.openCompareEditor(input);
-								}
-							}
-						});
 					} catch (TeamException e) {
 						throw new InvocationTargetException(e);
 					}
 				}
 			});
+			final SyncInfo info = subscriber.getSyncInfo(resource);
+			shell.getDisplay().syncExec(new Runnable() {
+				public void run() {
+					if (info.getKind() == SyncInfo.IN_SYNC) {
+						MessageDialog.openInformation(shell, Policy.bind("SyncAction.noChangesTitle"), Policy.bind("SyncAction.noChangesMessage")); //$NON-NLS-1$ //$NON-NLS-2$
+					} else {
+						SyncInfoCompareInput input = new SyncInfoCompareInput(subscriber.getName(), info);
+						CompareUI.openCompareEditor(input);
+					}
+				}
+			});
 		} catch (InvocationTargetException e) {
 			Utils.handle(e);
 		} catch (InterruptedException e) {
+		} catch (TeamException e) {
+			Utils.handle(e);
 		}
 	}