ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mac crash on error box after core is loaded

This commit is contained in:
Allen Webster 2017-11-28 14:19:08 -05:00
parent 53184771ad
commit aa74d71e0e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
platform_mac/mac_4ed.m
View File

@ -225,7 +225,7 @@ static i32 did_update_for_clipboard = true;
- (void)init_gl - (void)init_gl
{ {
if(osx_objc.running){ if (osx_objc.gl_is_initialized){
return; return;
} }
@ -253,7 +253,7 @@ static i32 did_update_for_clipboard = true;
[context makeCurrentContext]; [context makeCurrentContext];
osx_objc.running = true; osx_objc.gl_is_initialized = true;
} }
- (id)init - (id)init
@ -873,6 +873,7 @@ main(int argc, char **argv){
userInfo: nil repeats:YES]; userInfo: nil repeats:YES];
osx_init(); osx_init();
osx_objc.running = true;
[NSApp run]; [NSApp run];
} }

1
platform_mac/osx_objective_c_to_cpp_links.h
View File

@ -36,6 +36,7 @@ typedef struct OSX_Keyboard_Modifiers{
typedef struct OSX_Objective_C_Vars{ typedef struct OSX_Objective_C_Vars{
i32 width, height; i32 width, height;
b32 gl_is_initialized;
b32 running; b32 running;
u32 key_count; u32 key_count;
u32 keys[8]; u32 keys[8];