Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Krüger <mikkrg@microsoft.com>2018-04-13 08:57:47 +0300
committerMike Krüger <mikkrg@microsoft.com>2018-04-13 08:57:47 +0300
commite2bdbb8700ce71d933e6e073a9c84cd39c560fa9 (patch)
tree4ff6a68557e07778812347e330ce545ff296a44c /main/src/core
parentd555bbd497995cb053ba270ee3a2e75ac5e01187 (diff)
Fixes VSTS 597271: [Feedback] Getting "The type initializer for
'Mono.TextEditor.TextViewMargin' threw an exception." errors from VS Community (Mac) on macOS 10.13.5 Beta https://devdiv.visualstudio.com/DevDiv/_workitems/edit/597271 Seems to be a bug in the macOS beta but it can be handled.
Diffstat (limited to 'main/src/core')
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/OSXEditor.cs20
1 files changed, 13 insertions, 7 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 46842333f1..94beeedc4f 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/OSXEditor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/OSXEditor.cs
@@ -40,13 +40,19 @@ namespace MonoDevelop.Ide.Editor
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;
+ 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;
+ }
}
}