Skip to content

Fix the hang when OnUserCreate return false on linux #324

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
dandistine wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix the hang when OnUserCreate return false on linux #324

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
3 changes: 2 additions & 1 deletion dev/src/host_lin_wayland.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ namespace olc::host
if (!this->OnSystemThreadStart())
{
// PGE->OnContextStart() failed, or user aborted OnUserCreate()
systemActive = false;
return;
}

Expand All @@ -252,7 +253,7 @@ namespace olc::host
bool keep_running = true;
while(systemActive && keep_running) {
if(decor_context) {
poll(&decor_wl_fd, 1, -1);
poll(&decor_wl_fd, 1, 10);
{
std::lock_guard<std::mutex> l{decor_mutex};
keep_running = libdecor_dispatch(decor_context, 0) >= 0;
Expand Down
3 changes: 2 additions & 1 deletion dev/src/host_lin_x11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ namespace olc::host
// Notify start of system thread
if (!this->OnSystemThreadStart())
{
systemActive = false;
// PGE->OnContextStart() failed, or user aborted OnUserCreate()
return;
}
Expand Down Expand Up @@ -303,7 +304,7 @@ namespace olc::host
}

// Wait until an event appears on the x11 event queue file descriptor
poll(&x11_connection_fd, 1, -1);
poll(&x11_connection_fd, 1, 10);
}

systemActive = false;
Expand Down
6 changes: 4 additions & 2 deletions olcPixelGameEngine3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12427,6 +12427,7 @@ namespace olc::host
// Notify start of system thread
if (!this->OnSystemThreadStart())
{
systemActive = false;
// PGE->OnContextStart() failed, or user aborted OnUserCreate()
return;
}
Expand Down Expand Up @@ -12629,7 +12630,7 @@ namespace olc::host
}

// Wait until an event appears on the x11 event queue file descriptor
poll(&x11_connection_fd, 1, -1);
poll(&x11_connection_fd, 1, 10);
}

systemActive = false;
Expand Down Expand Up @@ -13201,6 +13202,7 @@ namespace olc::host
if (!this->OnSystemThreadStart())
{
// PGE->OnContextStart() failed, or user aborted OnUserCreate()
systemActive = false;
return;
}

Expand All @@ -13227,7 +13229,7 @@ namespace olc::host
bool keep_running = true;
while(systemActive && keep_running) {
if(decor_context) {
poll(&decor_wl_fd, 1, -1);
poll(&decor_wl_fd, 1, 10);
{
std::lock_guard<std::mutex> l{decor_mutex};
keep_running = libdecor_dispatch(decor_context, 0) >= 0;
Expand Down
Loading