XR: Fix potential crash when toggling session

2021-10-26 13:38:59 +09:00
parent 4c0512bc32
commit 9db13c8d79
1 changed files with 3 additions and 1 deletions
--- a/source/blender/windowmanager/xr/intern/wm_xr_session.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_session.c
@@ -137,8 +137,10 @@ void wm_xr_session_toggle(wmWindowManager *wm,
  wmXrData *xr_data = &wm->xr;

  if (WM_xr_session_exists(xr_data)) {
-    GHOST_XrSessionEnd(xr_data->runtime->context);
+    /* Must set first, since #GHOST_XrSessionEnd() may immediately free the runtime. */
    xr_data->runtime->session_state.is_started = false;
+
+    GHOST_XrSessionEnd(xr_data->runtime->context);
  }
  else {
    GHOST_XrSessionBeginInfo begin_info;