Skip to content

325-fix-the-hang-when-onusercreate-return-false-on-macos #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Johnnyg63 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

325-fix-the-hang-when-onusercreate-return-false-on-macos #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion dev/src/host_apple_macos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,8 @@ namespace olc::host {
if (!this->OnSystemThreadStart())
{
// PGE->OnContextStart() failed, or user aborted OnUserCreate()
return;
StopSystem();

}

// Main system loop
Expand Down Expand Up @@ -346,6 +347,9 @@ namespace olc::host {

bool Host_Apple_MacOS::StopSystem()
{
// Clear any pending tasks/messages on the main thread
bSkipFrame = ExecutePendingMainThreadTasks();

dispatch_sync(dispatch_get_main_queue(), ^{
// clean up and close application
if (pMacOSOpenGLRenderer)
Expand Down
6 changes: 5 additions & 1 deletion olcPixelGameEngine3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11822,7 +11822,8 @@ namespace olc::host {
if (!this->OnSystemThreadStart())
{
// PGE->OnContextStart() failed, or user aborted OnUserCreate()
return;
StopSystem();

}

// Main system loop
Expand Down Expand Up @@ -11858,6 +11859,9 @@ namespace olc::host {

bool Host_Apple_MacOS::StopSystem()
{
// Clear any pending tasks/messages on the main thread
bSkipFrame = ExecutePendingMainThreadTasks();

dispatch_sync(dispatch_get_main_queue(), ^{
// clean up and close application
if (pMacOSOpenGLRenderer)
Expand Down
Loading