From 83c919283711d2f1d3f57768a415ea303baa6e21 Mon Sep 17 00:00:00 2001
From: David Inglis <dinglis@qnx.com>
Date: Thu, 3 Feb 2005 19:19:48 +0000
Subject: [PATCH] Fixed PR#84361

---
 launch/org.eclipse.cdt.launch/ChangeLog          |  6 ++++++
 .../launch/internal/ui/AbstractCDebuggerTab.java |  1 -
 .../cdt/launch/ui/CoreFileDebuggerTab.java       | 16 ++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog
index 89f3405c2c7..2875960d606 100644
--- a/launch/org.eclipse.cdt.launch/ChangeLog
+++ b/launch/org.eclipse.cdt.launch/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-03 David Inglis
+	Fixed PR#84361
+	
+	* src/org/elipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java
+	* src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java
+	
 2005-01-19 Alain Magloire
 	PR 82930
 	* src/org/eclipse/cdt/launch/internal/CPropertyTester.java
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java
index ae1fe4d5837..bab928e7342 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/AbstractCDebuggerTab.java
@@ -137,7 +137,6 @@ public abstract class AbstractCDebuggerTab extends CLaunchConfigurationTab {
 			setInitializeDefault(false);
 			getDynamicTab().initializeFrom(wc);
 		}
-		updateLaunchConfigurationDialog();
 	}
 
 	/**
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java
index fd60d393a4d..fa5bdaf684e 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CoreFileDebuggerTab.java
@@ -84,6 +84,21 @@ public class CoreFileDebuggerTab extends AbstractCDebuggerTab {
 		setInitializing(false);
 	}
 
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.launch.internal.ui.AbstractCDebuggerTab#activated(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy)
+	 */
+	public void activated(ILaunchConfigurationWorkingCopy workingCopy) {
+		setInitializing(true);
+		try {
+			String id = workingCopy.getAttribute(ICDTLaunchConfigurationConstants.ATTR_DEBUGGER_ID, ""); //$NON-NLS-1$
+			loadDebuggerComboBox(workingCopy, id);
+		} catch (CoreException e) {
+		}
+		setInitializing(false);
+		super.activated(workingCopy);
+	}
+	
 	public boolean isValid(ILaunchConfiguration config) {
 		if (!validateDebuggerConfig(config)) {
 			return false;
@@ -106,6 +121,7 @@ public class CoreFileDebuggerTab extends AbstractCDebuggerTab {
 		}
 		return true;
 	}
+	
 	protected void loadDebuggerComboBox(ILaunchConfiguration config, String selection) {
 		ICDebugConfiguration[] debugConfigs = CDebugCorePlugin.getDefault().getDebugConfigurations();
 		String projectPlatform = getProjectPlatform(config);