From 319913e6afd462d7eb1cb9bbf4edd29c3d3e9edd Mon Sep 17 00:00:00 2001
From: luiscuenca <luiscuenca@outboxcode.com>
Date: Mon, 8 Jan 2018 20:37:07 -0700
Subject: [PATCH] Fix toolbar appears on HMD mode

---
 interface/src/Application.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f3c41565f8..1cc1b6b15a 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -7357,6 +7357,7 @@ void Application::updateThreadPoolCount() const {
 }
 
 void Application::updateSystemTabletMode() {
+    if (!_settingsLoaded) return;
     qApp->setProperty(hifi::properties::HMD, isHMDMode());
     if (isHMDMode()) {
         DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());