[MacDev] Don't pass a null relative path to Path.Combine()

1 files changed, 8 insertions, 9 deletions

diff --git a/main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeMonitor.cs b/main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeMonitor.cs
index b028d76fb2..8984011fbf 100644
--- a/main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeMonitor.cs
+++ b/main/src/addins/MonoDevelop.MacDev/XcodeSyncing/XcodeMonitor.cs
@@ -220,20 +220,19 @@ namespace MonoDevelop.MacDev.XcodeSyncing
 				if (knownFiles.Contains (file))
 					continue;
 				
+				FilePath relative;
+				if (relativePath != null)
+					relative = new FilePath (Path.Combine (relativePath, Path.GetFileName (file)));
+				else
+					relative = new FilePath (Path.GetFileName (file));
+				
 				if (file.EndsWith (".h")) {
 					NSObjectTypeInfo parsed = NSObjectInfoService.ParseHeader (file);
 					
-					monitor.Log.WriteLine ("New Objective-C header file found: {0}", Path.Combine (relativePath, Path.GetFileName (file)));
+					monitor.Log.WriteLine ("New Objective-C header file found: {0}", relative);
 					ctx.TypeSyncJobs.Add (XcodeSyncObjcBackJob.NewType (parsed, relativePath));
 				} else {
-					FilePath original, relative;
-					
-					if (relativePath != null)
-						relative = new FilePath (Path.Combine (relativePath, Path.GetFileName (file)));
-					else
-						relative = new FilePath (Path.GetFileName (file));
-					
-					original = ctx.Project.BaseDirectory.Combine (relative);
+					FilePath original = ctx.Project.BaseDirectory.Combine (relative);
 					
 					monitor.Log.WriteLine ("New content file found: {0}", relative);
 					ctx.FileSyncJobs.Add (new XcodeSyncFileBackJob (original, relative, XcodeSyncFileStatus.Added));