Bug 65051 - string_prompt variable prevents other variables from executing

3 files changed, 11 insertions, 4 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FilePrompt.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FilePrompt.java
index c870f14e2..ac07eca3b 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FilePrompt.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FilePrompt.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.stringsubstitution;
 
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.swt.widgets.FileDialog;
 
 /**
@@ -24,7 +23,7 @@ public class FilePrompt extends PromptingResolver {
 	 * @see PromptExpanderBase#prompt()
 	 */
 	public void prompt() {
-		FileDialog dialog = new FileDialog(DebugUIPlugin.getStandardDisplay().getActiveShell());
+		FileDialog dialog = new FileDialog(getShell());
 		dialog.setText(dialogMessage);
 		dialog.setFileName(lastValue == null ? defaultValue : lastValue);
 		dialogResultString = dialog.open();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FolderPrompt.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FolderPrompt.java
index 07c355fd6..f4fa04d2c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FolderPrompt.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/FolderPrompt.java
@@ -11,7 +11,6 @@
  *******************************************************************************/
 package org.eclipse.debug.internal.ui.stringsubstitution;
 
-import org.eclipse.debug.internal.ui.DebugUIPlugin;
 import org.eclipse.swt.widgets.DirectoryDialog;
 
 /**
@@ -24,7 +23,7 @@ public class FolderPrompt extends PromptingResolver {
 	 * @see PromptExpanderBase#prompt()
 	 */
 	public void prompt() {
-		DirectoryDialog dialog = new DirectoryDialog(DebugUIPlugin.getStandardDisplay().getActiveShell());
+		DirectoryDialog dialog = new DirectoryDialog(getShell());
 		dialog.setText(dialogMessage);
 		dialog.setFilterPath(lastValue == null ? defaultValue : lastValue);
 		dialogResultString = dialog.open();
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java
index 16520b7b3..eb37275c2 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/stringsubstitution/PromptingResolver.java
@@ -16,6 +16,7 @@ import java.text.MessageFormat;
 import org.eclipse.core.variables.IDynamicVariable;
 import org.eclipse.core.variables.IDynamicVariableResolver;
 import org.eclipse.debug.internal.ui.DebugUIPlugin;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Base implementation for variable resolvers that prompt the user
@@ -99,5 +100,13 @@ abstract class PromptingResolver implements IDynamicVariableResolver {
 		}
 		return value;
 	}
+	
+	protected Shell getShell() {
+		Shell shell = DebugUIPlugin.getStandardDisplay().getActiveShell();
+		if (shell == null) {
+			shell = DebugUIPlugin.getShell();
+		}
+		return shell;
+	}
 
 }