ipc: Initialize debug GUI after system · matrixfurry.com/monado@a5d8548

The open source OpenXR runtime

ipc: Initialize debug GUI after system

If we initialize the debug GUI first, then it will attempt to access a NULL system and fail.

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2638>

authored by

Beyley Cardellio and committed by

Marge Bot 3 months ago a5d85489 e2180b93

+3 -3

1 changed file

expand all

unified split

src

xrt

ipc

server

ipc_server_process.c

+3 -3

src/xrt/ipc/server/ipc_server_process.c

··· 1103 1103 return -1; 1104 1104 } 1105 1105 1106 - // Start the debug UI now (if enabled). 1107 - u_debug_gui_start(s->debug_gui, s->xinst, s->xsysd); 1108 - 1109 1106 // Tell the callbacks we are entering the main-loop. 1110 1107 callbacks->mainloop_entering(s, s->xinst, data); 1111 1108 ··· 1117 1114 if (xret != XRT_SUCCESS) { 1118 1115 U_LOG_CHK_ONLY_PRINT(log_level, xret, "ipc_server_init_system_if_available_locked"); 1119 1116 } 1117 + 1118 + // Start the debug UI now (if enabled). 1119 + u_debug_gui_start(s->debug_gui, s->xinst, s->xsysd); 1120 1120 1121 1121 // Main loop. 1122 1122 ret = main_loop(s);