[Bf-blender-cvs] [b617411] HMD_viewport: Fix HMD session not ended correctly when closing HMD view during session

[Julian Eisel]

Commit: b6174113c920754ec09dcce1cd6108add32ccdc6
Author: Julian Eisel
Date:   Mon Mar 28 19:09:13 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rBb6174113c920754ec09dcce1cd6108add32ccdc6

Fix HMD session not ended correctly when closing HMD view during session

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

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

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

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 7d8167a..e236023 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -5156,9 +5156,13 @@ static int wm_hmd_view_toggle_invoke(bContext *C, wmOperator *UNUSED(op), const
 
 	/* close */
 	if ((win = wm->win_hmd)) {
-		hmd_view_exit(C, CTX_data_scene(C));
+		Scene *sc = CTX_data_scene(C);
+		sc->flag &= ~SCE_HMD_RUNNING;
+		hmd_view_exit(C, sc);
 		wm_window_close(C, wm, win);
 		wm->win_hmd = NULL;
+		/* close HMD */
+		WM_device_HMD_state_set(U.hmd_device, false);
 	}
 	/* open */
 	else {