From 4667165463b25402c2a3ef6938c11c9ebf327107 Mon Sep 17 00:00:00 2001
From: matzman666 <matzman@matzman.net>
Date: Thu, 29 Dec 2016 16:03:47 +0100
Subject: [PATCH] Bugfixes.

---
 bin/win64/res/qml/PlayspacePage.qml           | 2 --
 src/tabcontrollers/ChaperoneTabController.cpp | 1 +
 src/tabcontrollers/ChaperoneTabController.h   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/bin/win64/res/qml/PlayspacePage.qml b/bin/win64/res/qml/PlayspacePage.qml
index 14a1de7..62ad039 100644
--- a/bin/win64/res/qml/PlayspacePage.qml
+++ b/bin/win64/res/qml/PlayspacePage.qml
@@ -327,14 +327,12 @@ MyStackViewPage {
             onTrackingUniverseChanged: {
                 if (MoveCenterTabController.trackingUniverse === 0) {
                     playspaceModeText.text = "Sitting"
-                    playspaceApplyButton.enabled = false
                     playSpaceRotationPlusButton.enabled = false
                     playSpaceRotationMinusButton.enabled = false
                     playspaceRotationSlider.enabled = false
                     playspaceRotationText.text = "-"
                 } else if (MoveCenterTabController.trackingUniverse === 1) {
                     playspaceModeText.text = "Standing"
-                    playspaceApplyButton.enabled = true
                     playSpaceRotationPlusButton.enabled = true
                     playSpaceRotationMinusButton.enabled = true
                     playspaceRotationSlider.enabled = true
diff --git a/src/tabcontrollers/ChaperoneTabController.cpp b/src/tabcontrollers/ChaperoneTabController.cpp
index f0981b9..8da6eeb 100644
--- a/src/tabcontrollers/ChaperoneTabController.cpp
+++ b/src/tabcontrollers/ChaperoneTabController.cpp
@@ -202,6 +202,7 @@ void ChaperoneTabController::eventLoopTick() {
 			LOG(WARNING) << "Could not read \"" << vr::k_pch_CollisionBounds_PlaySpaceOn_Bool << "\" setting: " << vr::VRSettings()->GetSettingsErrorNameFromEnum(vrSettingsError);
 		}
 		setPlaySpaceMarker(ps);
+		updateHeight(getBoundsMaxY());
 		settingsUpdateCounter = 0;
 	} else {
 		settingsUpdateCounter++;
diff --git a/src/tabcontrollers/ChaperoneTabController.h b/src/tabcontrollers/ChaperoneTabController.h
index 121e914..51347f0 100644
--- a/src/tabcontrollers/ChaperoneTabController.h
+++ b/src/tabcontrollers/ChaperoneTabController.h
@@ -107,7 +107,7 @@ public slots:
 	void reloadFromDisk();
 
 	void addChaperoneProfile(QString name, bool includeGeometry, bool includeVisbility, bool includeFadeDistance, bool includeCenterMarker,
-	bool includePlaySpaceMarker, bool includeFloorBounds, bool includeBoundsColor, bool includeChaperoneStyle, bool includeForceBounds);
+				bool includePlaySpaceMarker, bool includeFloorBounds, bool includeBoundsColor, bool includeChaperoneStyle, bool includeForceBounds);
 	void applyChaperoneProfile(unsigned index);
 	void deleteChaperoneProfile(unsigned index);