No longer generate potentially wrong files when type resolving fails.

2 files changed, 17 insertions, 6 deletions

diff --git a/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectProjectInfo.cs b/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectProjectInfo.cs
index ec891fdd03..d15ec3c3f7 100644
--- a/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectProjectInfo.cs
+++ b/main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectProjectInfo.cs
@@ -45,6 +45,11 @@ namespace MonoDevelop.MacDev.ObjCIntegration
 		ProjectDom dom;
 		bool needsUpdating;
 		
+		public bool ContainsErrors {
+			get;
+			private set;
+		}
+		
 		public NSObjectProjectInfo (ProjectDom dom, NSObjectInfoService infoService)
 		{
 			this.infoService = infoService;
@@ -76,6 +81,7 @@ namespace MonoDevelop.MacDev.ObjCIntegration
 			
 			objcTypes.Clear ();
 			cliTypes.Clear ();
+			ContainsErrors = false;
 			
 			foreach (var type in infoService.GetRegisteredObjects (dom)) {
 				objcTypes.Add (type.ObjCName, type);
@@ -197,6 +203,7 @@ namespace MonoDevelop.MacDev.ObjCIntegration
 					} else {
 						MessageService.ShowError (GettextCatalog.GetString ("Error while syncing object c type."),
 							string.Format (GettextCatalog.GetString ("Type '{0}' can't be resolved to a valid cli type."), outlet.ObjCType));
+						ContainsErrors = true;
 						outlet.CliType = outlet.ObjCType;
 					}
 				}
diff --git a/main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeSyncedType.cs b/main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeSyncedType.cs
index 8c836520c0..e0305162e4 100644
--- a/main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeSyncedType.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeSyncedType.cs
@@ -96,12 +96,16 @@ namespace MonoDevelop.MacDev.XcodeSyncing
 			//FIXME: detect unresolved types
 			parsed.MergeCliInfo (objcType);
 			context.ProjectInfo.ResolveTypes (parsed);
-			
-			context.TypeSyncJobs.Add (new XcodeSyncObjcBackJob () {
-				HFile = hFile,
-				DesignerFile = objcType.GetDesignerFile (),
-				Type = parsed,
-			});
+			if (!context.ProjectInfo.ContainsErrors) {
+				context.TypeSyncJobs.Add (new XcodeSyncObjcBackJob () {
+					HFile = hFile,
+					DesignerFile = objcType.GetDesignerFile (),
+					Type = parsed,
+				});
+			} else {
+				context.SetSyncTimeToNow (Type.ObjCName + ".h");
+				LoggingService.LogWarning ("Sync back skipped because of errors in project info.");
+			}
 		}
 		
 		const string supportingFilesGroup = "Supporting Files";