From 3cdc4ae467e308bac2947521ccb3bb49a57070bb Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Fri, 7 Dec 2018 20:22:42 +0000 Subject: [PATCH] Fixes OSX 10.14.2 --- native/Avalonia.Native/src/OSX/gl.mm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/native/Avalonia.Native/src/OSX/gl.mm b/native/Avalonia.Native/src/OSX/gl.mm index a62098a074..083adc927d 100644 --- a/native/Avalonia.Native/src/OSX/gl.mm +++ b/native/Avalonia.Native/src/OSX/gl.mm @@ -208,9 +208,8 @@ public: virtual ~AvnGlRenderingSession() { - glFlush(); [_context flushBuffer]; - [_context setView:nil]; + [NSOpenGLContext clearCurrentContext]; CGLUnlockContext([_context CGLContextObj]); [_view unlockFocus]; } @@ -241,9 +240,8 @@ public: auto gl = _context; CGLLockContext([_context CGLContextObj]); [gl setView: _view]; + [gl update]; [gl makeCurrentContext]; - auto frame = [_view frame]; - *ret = new AvnGlRenderingSession(_window, _view, gl); return S_OK; }