From b80597a4361cab1508c7a6eb09df501cf0bc38f7 Mon Sep 17 00:00:00 2001 From: Gabriel Calero Date: Tue, 15 May 2018 15:51:11 -0300 Subject: [PATCH] Restore display plugin activation/deactivation --- interface/src/Application.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index eda8b9bf12..c03b708af7 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -8192,11 +8192,17 @@ void Application::openAndroidActivity(const QString& activityName) { void Application::enterBackground() { QMetaObject::invokeMethod(DependencyManager::get().data(), "stop", Qt::BlockingQueuedConnection); + if (getActiveDisplayPlugin()->isActive()) { + getActiveDisplayPlugin()->deactivate(); + } } void Application::enterForeground() { QMetaObject::invokeMethod(DependencyManager::get().data(), "start", Qt::BlockingQueuedConnection); + if (!getActiveDisplayPlugin() || getActiveDisplayPlugin()->isActive() || !getActiveDisplayPlugin()->activate()) { + qWarning() << "Could not re-activate display plugin"; + } } #endif