[Bf-blender-cvs] [9db13c8d793] master: XR: Fix potential crash when toggling session

[Peter Kim]

Commit: 9db13c8d793e4b11ba717e9e4124b1faae66fe8a
Author: Peter Kim
Date:   Tue Oct 26 13:38:59 2021 +0900
Branches: master
https://developer.blender.org/rB9db13c8d793e4b11ba717e9e4124b1faae66fe8a

XR: Fix potential crash when toggling session

===================================================================

M	source/blender/windowmanager/xr/intern/wm_xr_session.c

===================================================================

diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.c b/source/blender/windowmanager/xr/intern/wm_xr_session.c
index 62757c0bddd..98cc4e21953 100644
--- 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;