diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index c1589db849a..47b9f129166 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-23 Mikhail Khodjaiants
+	Fix for bug 49294: Source file doesn't change when switching between stack frames. 
+	Do not use the breakpoint's markers for source lookup.
+	* CSourceManager.java
+
 2003-12-08 Mikhail Khodjaiants
 	Reset the 'terminating' flag if 'terminate' fails.
 	* CDebugTarget.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java
index c8e2ca56da0..488320e9d49 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/sourcelookup/CSourceManager.java
@@ -157,14 +157,7 @@ public class CSourceManager implements ICSourceLocator,
 		boolean autoDisassembly = CDebugCorePlugin.getDefault().getPluginPreferences().getBoolean( ICDebugConstants.PREF_AUTO_DISASSEMBLY );
 		
 		if ( getMode() == ISourceMode.MODE_SOURCE && getSourceLocator() != null )
-		{
-			// if the target is suspended by a line breakpoint the source manager 
-			// tries to retrieve the file resource from the breakpoint marker.
-			if ( getDebugTarget() != null )
-				result = getDebugTarget().getCurrentBreakpointFile();
-			if ( result == null )
-				result = getSourceLocator().getSourceElement( stackFrame );
-		}
+			result = getSourceLocator().getSourceElement( stackFrame );
 		if ( result == null && 
 			 ( autoDisassembly || getMode() == ISourceMode.MODE_DISASSEMBLY ) && 
 			 getDisassemblyManager( stackFrame ) != null )