From 8583be41ce5a46abd199b3e9b5a54426ee69f27b Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 21 Sep 2017 13:23:29 -0700 Subject: [PATCH] Don't refresh if not connected to the Asset Server --- .../src/scripting/AssetMappingsScriptingInterface.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/interface/src/scripting/AssetMappingsScriptingInterface.cpp b/interface/src/scripting/AssetMappingsScriptingInterface.cpp index abe31932c9..5031016c3f 100644 --- a/interface/src/scripting/AssetMappingsScriptingInterface.cpp +++ b/interface/src/scripting/AssetMappingsScriptingInterface.cpp @@ -19,11 +19,12 @@ #include #include #include +#include #include static const int AUTO_REFRESH_INTERVAL = 1000; -const int assetMappingModelMetatypeId = qRegisterMetaType("AssetMappingModel*"); +int assetMappingModelMetatypeId = qRegisterMetaType("AssetMappingModel*"); AssetMappingsScriptingInterface::AssetMappingsScriptingInterface() { _proxyModel.setSourceModel(&_assetMappingModel); @@ -195,7 +196,11 @@ AssetMappingModel::AssetMappingModel() { setupRoles(); connect(&_autoRefreshTimer, &QTimer::timeout, this, [this] { - refresh(); + auto nodeList = DependencyManager::get(); + auto assetServer = nodeList->soloNodeOfType(NodeType::AssetServer); + if (assetServer) { + refresh(); + } }); _autoRefreshTimer.setInterval(AUTO_REFRESH_INTERVAL); }