mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

Crabby allen got the fullscreen crash under control at least

master
Allen Webster 2020-05-01 19:19:21 -07:00
parent b43487096f
commit 161f3711f6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platform_mac/mac_4ed.mm
View File

@ -714,6 +714,14 @@ mac_toggle_fullscreen(void){
MacProfileScope("Draw Rect"){ MacProfileScope("Draw Rect"){
mac_vars.step_requested = false; mac_vars.step_requested = false;
// NOTE(yuval): Toggle full screen
MacProfileScope("Toggle Full Screen"){
if (mac_vars.do_toggle){
mac_toggle_fullscreen();
mac_vars.do_toggle = false;
}
}
MacProfileScope("Acquire Frame Mutex"){ MacProfileScope("Acquire Frame Mutex"){
// NOTE(yuval): Read comment in win32_4ed.cpp's main loop // NOTE(yuval): Read comment in win32_4ed.cpp's main loop
system_mutex_acquire(mac_vars.global_frame_mutex); system_mutex_acquire(mac_vars.global_frame_mutex);
@ -1440,7 +1448,7 @@ main(int arg_count, char **args){
mac_vars.running_cli = 0; mac_vars.running_cli = 0;
if (plat_settings.fullscreen_window){ if (plat_settings.fullscreen_window){
mac_toggle_fullscreen(); mac_vars.do_toggle = true;
} }
mac_vars.global_frame_mutex = system_mutex_make(); mac_vars.global_frame_mutex = system_mutex_make();