[Bf-blender-cvs] [eb477c67a15] soc-2019-openxr: Fix crash when no OpenXR runtime is found (or setup failed)

[Julian Eisel]

Commit: eb477c67a15bae88998c50be42cc08acaab41782
Author: Julian Eisel
Date:   Thu Aug 15 15:50:01 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rBeb477c67a15bae88998c50be42cc08acaab41782

Fix crash when no OpenXR runtime is found (or setup failed)

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

M	source/blender/windowmanager/intern/wm_xr.c

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

diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c
index 0b136d81076..8c3139254d5 100644
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@ -125,7 +125,9 @@ bool wm_xr_context_ensure(bContext *C, wmWindowManager *wm)
       create_info.context_flag |= GHOST_kXrContextDebugTime;
     }
 
-    wm->xr_context = GHOST_XrContextCreate(&create_info);
+    if (!(wm->xr_context = GHOST_XrContextCreate(&create_info))) {
+      return false;
+    }
 
     /* Set up context callbacks */
     GHOST_XrGraphicsContextBindFuncs(wm->xr_context,
@@ -133,8 +135,9 @@ bool wm_xr_context_ensure(bContext *C, wmWindowManager *wm)
                                      wm_xr_session_gpu_binding_context_destroy);
     GHOST_XrDrawViewFunc(wm->xr_context, wm_xr_draw_view);
   }
+  BLI_assert(wm->xr_context != NULL);
 
-  return wm->xr_context != NULL;
+  return true;
 }
 
 void wm_xr_context_destroy(wmWindowManager *wm)