Fix mini tablet always displaying if start up in HMD mode

This commit is contained in:
David Rowe 2018-11-08 17:47:02 +13:00
parent e5fe2622ae
commit 371919b923

View file

@ -1057,6 +1057,8 @@
function setUp() {
miniState = new State();
HMD.miniTabletEnabledChanged.connect(onMiniTabletEnabledChanged);
miniTabletEnabled = HMD.miniTabletEnabled;
Messages.subscribe(HIFI_OBJECT_MANIPULATION_CHANNEL);
@ -1064,8 +1066,8 @@
MyAvatar.wentAway.connect(onWentAway);
HMD.displayModeChanged.connect(onDisplayModeChanged);
HMD.miniTabletEnabledChanged.connect(onMiniTabletEnabledChanged);
if (HMD.active) {
if (HMD.active && miniTabletEnabled) {
miniState.setState(miniState.MINI_HIDDEN);
}
}
@ -1073,13 +1075,14 @@
function tearDown() {
miniState.setState(miniState.MINI_DISABLED);
HMD.miniTabletEnabledChanged.disconnect(onMiniTabletEnabledChanged);
HMD.displayModeChanged.disconnect(onDisplayModeChanged);
MyAvatar.wentAway.disconnect(onWentAway);
Messages.messageReceived.disconnect(onMessageReceived);
Messages.unsubscribe(HIFI_OBJECT_MANIPULATION_CHANNEL);
HMD.miniTabletEnabledChanged.disconnect(onMiniTabletEnabledChanged);
miniState.destroy();
miniState = null;
}