1 files changed, 15 insertions, 2 deletions

diff --git a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java
index 376cbb600a..cdc77bf5d8 100644
--- a/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java
+++ b/valgrind/org.eclipse.linuxtools.valgrind.launch/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchPlugin.java
@@ -56,11 +56,13 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin {
 	public static final Version VER_3_3_1 = new Version(3, 3, 1);
 	public static final Version VER_3_4_0 = new Version(3, 4, 0);
 	public static final Version VER_3_4_1 = new Version(3, 4, 1);
+	private static final Version MIN_VER = VER_3_3_0;
 	private static final String VERSION_PREFIX = "valgrind-"; //$NON-NLS-1$
 	private static final char VERSION_DELIMITER = '-';
 	
 	protected HashMap<String, IConfigurationElement> toolMap;
 	
+	private ValgrindCommand valgrindCommand;
 	private IPath valgrindLocation;
 	private Version valgrindVersion;
 	private ILaunchConfiguration config;
@@ -117,6 +119,10 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin {
 		if (valgrindVersion == null) {
 			findValgrindVersion();
 		}
+		// check for minimum supported version
+		if (valgrindVersion.compareTo(MIN_VER) < 0) {
+			throw new CoreException(new Status(IStatus.ERROR, PLUGIN_ID, NLS.bind(Messages.getString("ValgrindLaunchPlugin.Error_min_version"), valgrindVersion.toString(), MIN_VER.toString()))); //$NON-NLS-1$
+		}
 		return valgrindVersion;
 	}
 	
@@ -155,9 +161,16 @@ public class ValgrindLaunchPlugin extends AbstractUIPlugin {
 			throw new CoreException(status);
 		}
 	}
-		
+	
+	public void setValgrindCommand(ValgrindCommand command) {
+		valgrindCommand = command;
+	}
+	
 	protected ValgrindCommand getValgrindCommand() {
-		return new ValgrindCommand();
+		if (valgrindCommand == null) {
+			valgrindCommand = new ValgrindCommand();
+		}
+		return valgrindCommand;
 	}
 	
 	public String[] getRegisteredToolIDs() {