Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/cross
diff options
context:
space:
mode:
Diffstat (limited to 'cross')
-rw-r--r--cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
index 33db9e0cc16..36f63c7c9fa 100644
--- a/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
+++ b/cross/org.eclipse.cdt.launch.remote/src/org/eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java
@@ -43,6 +43,7 @@ import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.window.Window;
import org.eclipse.remote.core.IRemoteConnection;
import org.eclipse.remote.core.IRemoteServicesManager;
import org.eclipse.remote.ui.dialogs.RemoteResourceBrowser;
@@ -330,7 +331,13 @@ public class RemoteCDSFMainTab extends CMainTab {
SWT.NONE);
b.setConnection(currentConnectionSelected);
b.setTitle(Messages.RemoteCMainTab_Remote_Path_Browse_Button_Title);
- b.open();
+ int returnCode = b.open();
+
+ // User cancelled the browse dialog?
+ if (returnCode == Window.CANCEL) {
+ return;
+ }
+
IFileStore selectedFile = b.getResource();
if (selectedFile != null) {
String absPath = selectedFile.toURI().getPath();

Back to the top