From 8dcf6e6a036d74af7707dd19600e879deb2a1f74 Mon Sep 17 00:00:00 2001
From: Preston Bezos <preston@highfidelity.io>
Date: Wed, 12 Jun 2019 15:47:19 -0700
Subject: [PATCH] removed a dead line of code, made a couple formating changes
---
libraries/ui/src/OffscreenUi.cpp | 1 -
libraries/ui/src/OffscreenUi.h | 2 +-
scripts/simplifiedUI/ui/simplifiedUI.js | 4 +++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/libraries/ui/src/OffscreenUi.cpp b/libraries/ui/src/OffscreenUi.cpp
index e49ee811e0..f0b27904ae 100644
--- a/libraries/ui/src/OffscreenUi.cpp
+++ b/libraries/ui/src/OffscreenUi.cpp
@@ -690,7 +690,6 @@ void OffscreenUi::createDesktop(const QUrl& url) {
}
- QString toolbarName = newObject->property("toolbarObjectName").toString(); // will return "com.highfidelity.interface.toolbar.system"
auto toolbarScriptingInterface = DependencyManager::get<ToolbarScriptingInterface>();
connect(_desktop, SIGNAL(toolbarVisibleChanged(bool, QString)), toolbarScriptingInterface.data(), SIGNAL(toolbarVisibleChanged(bool, QString)));
diff --git a/libraries/ui/src/OffscreenUi.h b/libraries/ui/src/OffscreenUi.h
index 13326f8c2d..6abbc486d0 100644
--- a/libraries/ui/src/OffscreenUi.h
+++ b/libraries/ui/src/OffscreenUi.h
@@ -270,7 +270,7 @@ private:
QList<QObject*> _modalDialogListeners;
std::unordered_map<int, bool> _pressedKeys;
VrMenu* _vrMenu { nullptr };
- QQueue<std::function<void(VrMenu*)>> _queuedMenuInitializers;
+ QQueue<std::function<void(VrMenu*)>> _queuedMenuInitializers;
};
#endif
diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js
index 73b3d14fec..45dd02dc2a 100644
--- a/scripts/simplifiedUI/ui/simplifiedUI.js
+++ b/scripts/simplifiedUI/ui/simplifiedUI.js
@@ -466,7 +466,9 @@ function onDisplayModeChanged(isHMDMode) {
function onToolbarVisibleChanged(isVisible, toolbarName) {
if (isVisible && toolbarName == TOOLBAR_NAME) {
var toolbar = Toolbars.getToolbar(toolbarName);
- toolbar.writeProperty("visible", false);
+ if (toolbar) {
+ toolbar.writeProperty("visible", false);
+ }
}
}