Skip to content

Commit f1f2730

Browse files
allefantSiegeLord
authored andcommitted
fix osx catalina
1 parent 25de4fa commit f1f2730

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/macosx/osxgl.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -740,8 +740,9 @@ static void setup_gl(ALLEGRO_DISPLAY *d)
740740
{
741741
_al_ogl_setup_gl(d);
742742

743-
ALLEGRO_DISPLAY_OSX_WIN* dpy = (ALLEGRO_DISPLAY_OSX_WIN*) d;
744-
[dpy->ctx update];
743+
// TODO: This crashes on OSX Catalina, but does not seem to be needed
744+
//ALLEGRO_DISPLAY_OSX_WIN* dpy = (ALLEGRO_DISPLAY_OSX_WIN*) d;
745+
//[dpy->ctx update];
745746
}
746747

747748

src/macosx/system.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ static void osx_tell_dock(void)
6666
{
6767
ProcessSerialNumber psn = { 0, kCurrentProcess };
6868
TransformProcessType(&psn, kProcessTransformToForegroundApplication);
69-
[[NSApplication sharedApplication] activateIgnoringOtherApps: YES];
69+
[[NSApplication sharedApplication] performSelectorOnMainThread: @selector(activateIgnoringOtherApps:)
70+
withObject: YES
71+
waitUntilDone: YES];
7072
}
7173

7274

0 commit comments

Comments
 (0)