From dcefb740f278e2cd76b66b584820b33e14b8207e Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 26 Feb 2016 13:36:12 +0100
Subject: [PATCH] Create glcontext_get_ptr

---
 gfx/drivers_context/cocoa_gl_ctx.m |  5 +++++
 ui/drivers/ui_cocoa.m              | 13 +++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
index cd58aac4f4..67a352b673 100644
--- a/gfx/drivers_context/cocoa_gl_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -90,6 +90,11 @@ static NSOpenGLPixelFormat* g_format;
 static unsigned g_minor = 0;
 static unsigned g_major = 0;
 
+GLContextClass *glcontext_get_ptr(void)
+{
+   return g_context;
+}
+
 /* forward declaration */
 void *nsview_get_ptr(void);
 
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index f88abf02bc..c20767c17e 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -36,6 +36,9 @@
 
 static id apple_platform;
 
+/* forward declaration */
+GLContextClass *glcontext_get_ptr(void);
+
 void apple_rarch_exited(void)
 {
    [[NSApplication sharedApplication] terminate:nil];
@@ -347,10 +350,11 @@ static void open_document_handler(NSOpenPanel *panel, NSInteger result)
 }
 
 - (IBAction)openCore:(id)sender {
-    NSOpenPanel* panel = (NSOpenPanel*)[NSOpenPanel openPanel];
+   GLContextClass *glc   = glcontext_get_ptr();
+    NSOpenPanel* panel   = (NSOpenPanel*)[NSOpenPanel openPanel];
     settings_t *settings = config_get_ptr();
     NSString *startdir   = BOXSTRING(settings->libretro_directory);
-	NSArray *filetypes   = [[NSArray alloc] initWithObjects:BOXSTRING("dylib"), BOXSTRING("Core"), nil];
+	NSArray *filetypes    = [[NSArray alloc] initWithObjects:BOXSTRING("dylib"), BOXSTRING("Core"), nil];
 	[panel setAllowedFileTypes:filetypes];
 #if defined(MAC_OS_X_VERSION_10_6)
     [panel setMessage:BOXSTRING("Load Core")];
@@ -372,11 +376,12 @@ static void open_document_handler(NSOpenPanel *panel, NSInteger result)
 	if (result == 1)
        open_core_handler(panel, result);
 #endif
-    [g_context makeCurrentContext];
+    [glc makeCurrentContext];
 }
 
 - (void)openDocument:(id)sender
 {
+   GLContextClass *glc   = glcontext_get_ptr();
    NSOpenPanel* panel    = (NSOpenPanel*)[NSOpenPanel openPanel];
    settings_t *settings  = config_get_ptr();
    NSString *startdir    = BOXSTRING(settings->menu_content_directory);
@@ -403,7 +408,7 @@ static void open_document_handler(NSOpenPanel *panel, NSInteger result)
     if (result == 1)
         open_document_handler(panel, result);
 #endif
-    [g_context makeCurrentContext];
+    [glc makeCurrentContext];
 }
 
 - (void)unloadingCore