diff options
author | Mike Krüger <mikkrg@microsoft.com> | 2018-04-16 12:07:54 +0300 |
---|---|---|
committer | Mike Krüger <mikkrg@microsoft.com> | 2018-04-16 12:07:54 +0300 |
commit | 57b47962483b6c3a860592f316125365ff4728c4 (patch) | |
tree | 6b8f8f22e28fb99008e8390d327bcf5aa0398d55 | |
parent | e2bdbb8700ce71d933e6e073a9c84cd39c560fa9 (diff) |
[Ide] Guard against multiple IBeamCursorImage calls.
-rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/OSXEditor.cs | 32 |
1 files changed, 19 insertions, 13 deletions
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 94beeedc4f..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,24 +34,30 @@ 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; - try { - var cacheFileName = Path.Combine(UserProfile.Current.CacheDir, "MacCursorImage.tiff"); - if (!File.Exists(cacheFileName)) { - NSCursor.IBeamCursor.Image.AsTiff().Save(cacheFileName, true); + 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; } - 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; } } } |