From c380812496f226d6d3243a2b1c083f6aed8a4dc9 Mon Sep 17 00:00:00 2001 From: pierre lamot Date: Tue, 24 Feb 2015 15:50:58 +0100 Subject: [PATCH] evas: bypass lockfocus in NSView on OSX this patch bypass calls to (un)lockFocus, avoid segv when closing windows This is certainly not the cleanest way to do it but it seems to be working correctly at the moment. this may leads to unexepected behavior which haven't been identified now @fix Signed-off-by: Cedric BAIL --- src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m b/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m index 6a4c0ad165..882a7d7a2b 100644 --- a/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m +++ b/src/modules/evas/engines/gl_cocoa/evas_gl_cocoa_main.m @@ -1,4 +1,3 @@ - #include #include "evas_engine.h" @@ -59,12 +58,16 @@ static NSOpenGLContext *_evas_gl_cocoa_shared_context = NULL; return self; } +- (void)unlockFocus +{ + //[super unlockFocus]; +} + - (void)lockFocus { NSOpenGLContext* context = [self openGLContext]; - [super lockFocus]; - + //[super lockFocus]; if ([context view] != self) { [context setView:self]; }