X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fcommands%2FCreateWorkspace.java;fp=plugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fcommands%2FCreateWorkspace.java;h=86cf1926b5f267446c36bff05df4b871f5489fc7;hb=e2ad359a9b5d3822dcc2ad0576070fc46e2847d8;hp=812e6eebe01e4d35e0380f783d10a1f9fea15075;hpb=1c6b701cce4c42f5643a97ec81565032a869a42d;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
index 812e6eebe..86cf1926b 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java
@@ -29,6 +29,7 @@ import org.argeo.slc.client.ui.dist.utils.CommandHelpers;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.ui.IWorkbenchWindow;
 
@@ -54,7 +55,12 @@ public class CreateWorkspace extends AbstractHandler {
 		InputDialog inputDialog = new InputDialog(iww.getShell(),
 				"New workspace", "Choose a name for the workspace to create",
 				"", null);
-		inputDialog.open();
+		int result = inputDialog.open();
+
+		// Canceled by user
+		if (result == Dialog.CANCEL)
+			return null;
+
 		String workspaceName = inputDialog.getValue();
 		Session session = null;
 		try {