[Debugger] CLLocation/CLLocationCoordinate2D converter

1 files changed, 7 insertions, 1 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters/LocationConverters.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters/LocationConverters.cs
index 6021b707f4..a28b618c1b 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters/LocationConverters.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.Converters/LocationConverters.cs
@@ -41,13 +41,19 @@ namespace MonoDevelop.Debugger.Converters
 
 		public override bool CanGetValue (ObjectValue val)
 		{
-			return val.TypeName == "Android.Locations.Location";
+			return val.TypeName != null && (
+			    val.TypeName == "Android.Locations.Location" ||
+			    val.TypeName.EndsWith ("CoreLocation.CLLocationCoordinate2D") ||
+			    val.TypeName.EndsWith ("CoreLocation.CLLocation"));
 		}
 
 		public override GpsLocation GetValue (ObjectValue val)
 		{
 			var ops = DebuggingService.DebuggerSession.EvaluationOptions.Clone ();
 			ops.AllowTargetInvoke = true;
+			if (val.TypeName.EndsWith ("CoreLocation.CLLocation")) {
+				val = val.GetChild ("Coordinate", ops);
+			}
 			return new GpsLocation () {
 				Latitude = (double)val.GetChild ("Latitude", ops).GetRawValue (ops),
 				Longitude = (double)val.GetChild ("Longitude", ops).GetRawValue (ops)