From d8282ae79993d36946919a879e955b7a4e0ec7c5 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 5 Apr 2016 13:56:39 -0700 Subject: [PATCH 1/3] log value of QTWEBENGINE_REMOTE_DEBUGGING before exit --- interface/src/Application.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 311583acb7..86925429ab 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -38,6 +38,8 @@ #include +#include + #include #include @@ -1120,6 +1122,11 @@ void Application::aboutToQuit() { } void Application::cleanupBeforeQuit() { + // add a logline indicating if QTWEBENGINE_REMOTE_DEBUGGING is set or not + QProcessEnvironment env; + bool webengineRemoteDebuggingSet = env.keys().contains("QTWEBENGINE_REMOTE_DEBUGGING"); + qCDebug(interfaceapp) << "QTWEBENGINE_REMOTE_DEBUGGING =" << webengineRemoteDebuggingSet; + // Stop third party processes so that they're not left running in the event of a subsequent shutdown crash. #ifdef HAVE_DDE DependencyManager::get()->setEnabled(false); From f42e968dda7096a93b95707a93d27ab8688c3b0d Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 5 Apr 2016 14:12:46 -0700 Subject: [PATCH 2/3] commit to repush to see if github is working yet --- interface/src/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 86925429ab..b50fe1292b 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1122,7 +1122,7 @@ void Application::aboutToQuit() { } void Application::cleanupBeforeQuit() { - // add a logline indicating if QTWEBENGINE_REMOTE_DEBUGGING is set or not + // add a logline indicating if QTWEBENGINE_REMOTE_DEBUGGING is set or not. QProcessEnvironment env; bool webengineRemoteDebuggingSet = env.keys().contains("QTWEBENGINE_REMOTE_DEBUGGING"); qCDebug(interfaceapp) << "QTWEBENGINE_REMOTE_DEBUGGING =" << webengineRemoteDebuggingSet; From bda8761e00bfede783f80c5171e700db5ff5d68e Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 5 Apr 2016 14:30:41 -0700 Subject: [PATCH 3/3] fix how env variable is accessed --- interface/src/Application.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index b50fe1292b..b4bc5fa665 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1122,10 +1122,9 @@ void Application::aboutToQuit() { } void Application::cleanupBeforeQuit() { - // add a logline indicating if QTWEBENGINE_REMOTE_DEBUGGING is set or not. - QProcessEnvironment env; - bool webengineRemoteDebuggingSet = env.keys().contains("QTWEBENGINE_REMOTE_DEBUGGING"); - qCDebug(interfaceapp) << "QTWEBENGINE_REMOTE_DEBUGGING =" << webengineRemoteDebuggingSet; + // add a logline indicating if QTWEBENGINE_REMOTE_DEBUGGING is set or not + QString webengineRemoteDebugging = QProcessEnvironment::systemEnvironment().value("QTWEBENGINE_REMOTE_DEBUGGING", "false"); + qCDebug(interfaceapp) << "QTWEBENGINE_REMOTE_DEBUGGING =" << webengineRemoteDebugging; // Stop third party processes so that they're not left running in the event of a subsequent shutdown crash. #ifdef HAVE_DDE