[Monodevelop-patches-list] r1990 - trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn

[commit-watcher at mono-cvs.ximian.com]

Author: toshok
Date: 2004-10-22 01:25:01 -0400 (Fri, 22 Oct 2004)
New Revision: 1990

Modified:
   trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebuggingService.cs
Log:
2004-10-21  Chris Toshok  <toshok at ximian.com>

        * DebuggingService.cs: return String.Empty from CurrentFilename
        * if
        the frame's SourceAddress is null.  Likewise, return -1 from
        CurrentLineNumber in this case.



Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog	2004-10-21 04:36:02 UTC (rev 1989)
+++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/ChangeLog	2004-10-22 05:25:01 UTC (rev 1990)
@@ -1,3 +1,9 @@
+2004-10-21  Chris Toshok  <toshok at ximian.com>
+
+	* DebuggingService.cs: return String.Empty from CurrentFilename if
+	the frame's SourceAddress is null.  Likewise, return -1 from
+	CurrentLineNumber in this case.
+
 2004-06-25  Todd Berman  <tberman at off.net>
 
 	* DebuggingService.cs: sync with cvs debugger.

Modified: trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebuggingService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebuggingService.cs	2004-10-21 04:36:02 UTC (rev 1989)
+++ trunk/MonoDevelop/Core/src/AddIns/DebuggerAddIn/DebuggingService.cs	2004-10-22 05:25:01 UTC (rev 1990)
@@ -278,7 +278,8 @@
 				if (IsRunning)
 					return String.Empty;
 
-				if (proc.CurrentFrame.SourceAddress.MethodSource.IsDynamic)
+				  if (proc.CurrentFrame.SourceAddress == null /* there's no source for this frame */
+				      || proc.CurrentFrame.SourceAddress.MethodSource.IsDynamic)
 					return String.Empty;
 
 				return proc.CurrentFrame.SourceAddress.MethodSource.SourceFile.FileName;
@@ -290,6 +291,9 @@
 				if (IsRunning)
 					return -1;
 
+				if (proc.CurrentFrame.SourceAddress == null /* there's no source for this frame */)
+					return -1;
+
 				return proc.CurrentFrame.SourceAddress.Row;
 			}
 		}