From b7bfd5fec4ce35d447c5b7f8cb309272c4897648 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Mon, 23 Feb 2015 12:54:46 -0500 Subject: [PATCH] Bug 458650: Remove change not directly related to NPE Partial revert of commit 196d978624fcb25c379728d10ddfa50be16b6c5d. The removed change was causing a problem where the connectionCombo pulldown was being set to its first element even for existing LC Change-Id: I6888f2f783a303770d2924d0351b5dd7b5c055cc Signed-off-by: Marc Khouzam --- .../eclipse/cdt/launch/remote/tabs/RemoteCDSFMainTab.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 64f12594329..8aa813071f0 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2015 PalmSource, Inc. and others. + * Copyright (c) 2006, 2014 PalmSource, Inc. and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -224,6 +224,8 @@ public class RemoteCDSFMainTab extends CMainTab { handleRemoteConnectionPropertiesSelected(); } }); + + updateConnectionPulldown(); } /* @@ -696,7 +698,7 @@ public class RemoteCDSFMainTab extends CMainTab { updateTargetProgFromConfig(config); updateSkipDownloadFromConfig(config); - updateConnectionPulldown(); + updateConnectionButtons(); isInitializing = false; }