From da071abd8b56333983755d1f0d32b705a6df9316 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Fri, 7 Jun 2019 16:25:04 -0700 Subject: [PATCH 1/2] wrapping the dependencyManager::get<> call with ifdef to prevent the log from constantly spitting out that instance does not exist --- interface/src/Application.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 0e873cbb70..7807014dd6 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -274,6 +274,8 @@ static QTimer pingTimer; #if defined(Q_OS_ANDROID) static bool DISABLE_WATCHDOG = true; #else + + static const QString DISABLE_WATCHDOG_FLAG{ "HIFI_DISABLE_WATCHDOG" }; static bool DISABLE_WATCHDOG = nsightActive() || QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG); #endif @@ -5180,11 +5182,13 @@ ivec2 Application::getMouse() const { } FaceTracker* Application::getActiveFaceTracker() { +#ifdef HAVE_DDE auto dde = DependencyManager::get(); if (dde && dde->isActive()) { return static_cast(dde.data()); } +#endif return nullptr; } @@ -7228,6 +7232,9 @@ void Application::nodeKilled(SharedNodePointer node) { _entityEditSender.nodeKilled(node); + qDebug() << "NODE KIlled: " << node->getType() << "********************************************************"; + + if (node->getType() == NodeType::AudioMixer) { QMetaObject::invokeMethod(DependencyManager::get().data(), "audioMixerKilled"); } else if (node->getType() == NodeType::EntityServer) { From b57e4869c8b29f19c42e16db6e25b9daa1a1df44 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Fri, 7 Jun 2019 16:26:21 -0700 Subject: [PATCH 2/2] removed debug info --- interface/src/Application.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 7807014dd6..8286f73ff0 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -274,8 +274,6 @@ static QTimer pingTimer; #if defined(Q_OS_ANDROID) static bool DISABLE_WATCHDOG = true; #else - - static const QString DISABLE_WATCHDOG_FLAG{ "HIFI_DISABLE_WATCHDOG" }; static bool DISABLE_WATCHDOG = nsightActive() || QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG); #endif @@ -7231,10 +7229,7 @@ void Application::nodeKilled(SharedNodePointer node) { _octreeProcessor.nodeKilled(node); _entityEditSender.nodeKilled(node); - - qDebug() << "NODE KIlled: " << node->getType() << "********************************************************"; - - + if (node->getType() == NodeType::AudioMixer) { QMetaObject::invokeMethod(DependencyManager::get().data(), "audioMixerKilled"); } else if (node->getType() == NodeType::EntityServer) {