Target Explorer: Fix "Source Paths" editor page data not correctly restored if connection details editor is reopened

1 files changed, 9 insertions, 2 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/SourceLookupEditorPage.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/SourceLookupEditorPage.java
index 86bb8dc3c..84db68b7d 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/SourceLookupEditorPage.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.ui/src/org/eclipse/tcf/te/tcf/launch/ui/editor/SourceLookupEditorPage.java
@@ -38,6 +38,9 @@ public class SourceLookupEditorPage extends AbstractTcfLaunchTabContainerEditorP
 		private final AbstractTcfLaunchTabContainerEditorPage editorPage;
 		private IPropertyChangeListener listener;
 
+		// Set the flag to true if the page is initializing
+		private boolean isInitializing = false;
+
 		/**
          * Constructor
          *
@@ -104,8 +107,10 @@ public class SourceLookupEditorPage extends AbstractTcfLaunchTabContainerEditorP
 		@Override
 		protected void updateLaunchConfigurationDialog() {
 			super.updateLaunchConfigurationDialog();
-			performApply(getLaunchConfig(editorPage.getPeerModel(editorPage.getEditorInput())));
-			editorPage.checkLaunchConfigDirty();
+			if (!isInitializing) {
+				performApply(getLaunchConfig(editorPage.getPeerModel(editorPage.getEditorInput())));
+				editorPage.checkLaunchConfigDirty();
+			}
 		}
 
 		/* (non-Javadoc)
@@ -114,7 +119,9 @@ public class SourceLookupEditorPage extends AbstractTcfLaunchTabContainerEditorP
 		@Override
 		public void initializeFrom(ILaunchConfiguration configuration) {
 			boolean oldDirty = editorPage.getEditor().isDirty() || editorPage.checkLaunchConfigDirty();
+			isInitializing = true;
 			super.initializeFrom(configuration);
+			isInitializing = false;
 			if (!oldDirty && editorPage.checkLaunchConfigDirty()) {
 				editorPage.extractData();
 			}