From ab5c4a927bf6a4ecd0edcf7a4c85e6d9dc46ee6a Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 14 Feb 2019 22:18:42 -0800
Subject: [PATCH] Fix asset browser being hidden in incorrect way on server
switch
---
interface/src/Application.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index bbe4d70ab6..579cde8861 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6988,17 +6988,19 @@ void Application::nodeActivated(SharedNodePointer node) {
#if !defined(DISABLE_QML)
auto offscreenUi = getOffscreenUI();
- auto assetDialog = offscreenUi ? offscreenUi->getRootItem()->findChild<QQuickItem*>("AssetServer") : nullptr;
- if (assetDialog) {
+ if (offscreenUi) {
auto nodeList = DependencyManager::get<NodeList>();
if (nodeList->getThisNodeCanWriteAssets()) {
// call reload on the shown asset browser dialog to get the mappings (if permissions allow)
- QMetaObject::invokeMethod(assetDialog, "reload");
+ auto assetDialog = offscreenUi ? offscreenUi->getRootItem()->findChild<QQuickItem*>("AssetServer") : nullptr;
+ if (assetDialog) {
+ QMetaObject::invokeMethod(assetDialog, "reload");
+ }
} else {
// we switched to an Asset Server that we can't modify, hide the Asset Browser
- assetDialog->setVisible(false);
+ offscreenUi->hide("AssetServer");
}
}
#endif