Merge pull request #4546 from mono/master-fix597271

Fixes VSTS 597271: [Feedback] Getting "The type initializer for

2 files changed, 26 insertions, 10 deletions

diff --git a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs
index 8070cec71c..208d2ed4b9 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs
@@ -525,7 +525,11 @@ namespace Mono.TextEditor
 		{
 #if MAC
 			var img = OSXEditor.IBeamCursorImage;
-			xtermCursorInverted = new Cursor(xtermCursor.Display, (InvertCursorPixbuf (img.ToPixbuf())), (int)img.Width / 2, (int)img.Height / 2);
+			if (img != null) {
+				xtermCursorInverted = new Cursor(xtermCursor.Display, (InvertCursorPixbuf (img.ToPixbuf())), (int)img.Width / 2, (int)img.Height / 2);
+			} else {
+				xtermCursorInverted = xtermCursor;
+			}
 #else
 			xtermCursorInverted = xtermCursor;
 #endif
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/OSXEditor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/OSXEditor.cs
index 46842333f1..5e97624536 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/OSXEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/OSXEditor.cs
@@ -34,19 +34,31 @@ namespace MonoDevelop.Ide.Editor
 {
 	class OSXEditor
 	{
+		static bool hasLoaded;
 		static Xwt.Drawing.Image image;
+		static object loadLock = new object ();
 
 		public static Xwt.Drawing.Image IBeamCursorImage {
 			get {
-				if (image != null)
-					return image;
-				var cacheFileName = Path.Combine(UserProfile.Current.CacheDir, "MacCursorImage.tiff");
-				if (!File.Exists(cacheFileName))
-					NSCursor.IBeamCursor.Image.AsTiff().Save(cacheFileName, true);
-				var img = Xwt.Drawing.Image.FromFile(cacheFileName);
-				var size = NSCursor.IBeamCursor.Image.Size;
-				image = img.WithSize(size.Width, size.Height);
-				return image;
+				lock (loadLock) {
+					if (hasLoaded)
+						return image;
+					try {
+						var cacheFileName = Path.Combine (UserProfile.Current.CacheDir, "MacCursorImage.tiff");
+						if (!File.Exists (cacheFileName)) {
+							NSCursor.IBeamCursor.Image.AsTiff ().Save (cacheFileName, true);
+						}
+						var img = Xwt.Drawing.Image.FromFile (cacheFileName);
+						var size = NSCursor.IBeamCursor.Image.Size;
+						image = img.WithSize (size.Width, size.Height);
+						return image;
+					} catch (Exception e) {
+						LoggingService.LogError ("Error while getting IBeam cursor image.", e);
+						return null;
+					} finally {
+						hasLoaded = true;
+					}
+				}
 			}
 		}