Skip to content

Lock wlserver while initializing wayland. #2023

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
hgaiser wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −2
Open

Lock wlserver while initializing wayland. #2023

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
11 changes: 9 additions & 2 deletions src/wlserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2079,7 +2079,11 @@ bool wlserver_init( void ) {

wl_log.infof("Running compositor on wayland display '%s'", wlserver.wl_display_name);

if (!wlr_backend_start( wlserver.wlr.multi_backend ))
wlserver_lock();
bool bBackendStarted = wlr_backend_start( wlserver.wlr.multi_backend );
wlserver_unlock();

if (!bBackendStarted)
{
wl_log.errorf("Failed to start backend");
wlr_backend_destroy( wlserver.wlr.multi_backend );
Expand Down Expand Up @@ -2121,8 +2125,11 @@ bool wlserver_init( void ) {
for (size_t i = 0; i < wlserver.wlr.xwayland_servers.size(); i++)
{
while (!wlserver.wlr.xwayland_servers[i]->is_xwayland_ready()) {
wlserver_lock();
wl_display_flush_clients(wlserver.display);
if (wl_event_loop_dispatch(wlserver.event_loop, -1) < 0) {
int ret = wl_event_loop_dispatch(wlserver.event_loop, -1);
wlserver_unlock();
if (ret < 0) {
wl_log.errorf("wl_event_loop_dispatch failed\n");
return false;
}
Expand Down