Nyaaori/gamescope
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

wlserver: improve wlr_session_create error handling

Browse source
This commit is contained in:
Simon Ser 2021-07-22 15:08:34 +02:00
parent 96346bd5f1
commit 52063b3858
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/wlserver.cpp
View file

@ -493,7 +493,15 @@ int wlserver_init(int argc, char **argv, bool bIsNested) {
signal(SIGINT, sig_handler);
signal(SIGUSR2, sig_handler);
wlserver.wlr.session = ( bIsDRM == True ) ? wlr_session_create(wlserver.wl_display) : NULL;
if ( bIsDRM == true )
{
wlserver.wlr.session = wlr_session_create( wlserver.wl_display );
if ( wlserver.wlr.session == nullptr )
{
fprintf( stderr, "Failed to create session\n" );
return 1;
}
}
wlserver.wl_event_loop = wl_display_get_event_loop(wlserver.wl_display);
wlserver.wl_event_loop_fd = wl_event_loop_get_fd( wlserver.wl_event_loop );
@ -501,7 +509,6 @@ int wlserver_init(int argc, char **argv, bool bIsNested) {
wlserver.wlr.multi_backend = wlr_multi_backend_create(wlserver.wl_display);
assert( wlserver.wl_display && wlserver.wl_event_loop && wlserver.wlr.multi_backend );
assert( !bIsDRM || wlserver.wlr.session );
wl_signal_add( &wlserver.wlr.multi_backend->events.new_input, &new_input_listener );