From 0cc062f8ab133f1e914a96180d572b14941a8dcd Mon Sep 17 00:00:00 2001 From: Mikhail Khodjaiants Date: Fri, 5 Dec 2003 18:30:44 +0000 Subject: [PATCH] 'performApply' of 'SourceLookupBlock' should check if the project in configuration is the same as project saved in the block. --- debug/org.eclipse.cdt.debug.ui/ChangeLog | 5 +++++ .../eclipse/cdt/debug/ui/sourcelookup/SourceLookupBlock.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debug/org.eclipse.cdt.debug.ui/ChangeLog b/debug/org.eclipse.cdt.debug.ui/ChangeLog index ade723f386a..b57c1919df7 100644 --- a/debug/org.eclipse.cdt.debug.ui/ChangeLog +++ b/debug/org.eclipse.cdt.debug.ui/ChangeLog @@ -1,3 +1,8 @@ +2003-12-05 Mikhail Khodjaiants + 'performApply' of 'SourceLookupBlock' should check if the project in configuration is the same as + project saved in the block. + * SourceLookupBlock.java + 2003-12-04 Mikhail Khodjaiants Changed the message displayed when the source file is not found. * CDebugEditor.java diff --git a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/SourceLookupBlock.java b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/SourceLookupBlock.java index d6a87ff9f20..44b862bcea5 100644 --- a/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/SourceLookupBlock.java +++ b/debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/sourcelookup/SourceLookupBlock.java @@ -254,7 +254,7 @@ public class SourceLookupBlock implements Observer if ( locator instanceof IAdaptable ) { ICSourceLocator clocator = (ICSourceLocator)((IAdaptable)locator).getAdapter( ICSourceLocator.class ); - if ( clocator != null ) + if ( clocator != null && getProject() != null && getProject().equals( getProjectFromLaunchConfiguration( configuration ) ) ) { clocator.setSourceLocations( getSourceLocations() ); clocator.setSearchForDuplicateFiles( searchForDuplicateFiles() );