diff options
| author | Mike Krüger <mikkrg@microsoft.com> | 2018-04-13 08:57:47 +0300 |
|---|---|---|
| committer | Mike Krüger <mikkrg@microsoft.com> | 2018-04-13 08:57:47 +0300 |
| commit | e2bdbb8700ce71d933e6e073a9c84cd39c560fa9 (patch) | |
| tree | 4ff6a68557e07778812347e330ce545ff296a44c /main | |
| parent | d555bbd497995cb053ba270ee3a2e75ac5e01187 (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')
| -rw-r--r-- | main/src/addins/MonoDevelop.SourceEditor2/Mono.TextEditor/Gui/TextViewMargin.cs | 6 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/OSXEditor.cs | 20 |
2 files changed, 18 insertions, 8 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..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; + } } } |